What's cooking (2011/02 #02)
Junio C Hamano committed
Feb 7, 2011 at 16:44 UTC
1d482371357974f386e76ee2399c7c4c9ec0e60e
1 file changed
+131
-120
whats-cooking.txt
+131
-120
@@ -1,18 +1,28 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2011, #01; Thu, 3)
3
-X-master-at: 597a63054241c122515c93cbce45bc44eb231f18
4
-X-next-at: ccfc03dd6521ffd2cbd803a18b12c204fd5e54d0
2
+Subject: What's cooking in git.git (Feb 2011, #02; Mon, 7)
3
+X-master-at: 7811d9600f02e70c9f835719c71156c967a684f7
4
+X-next-at: 3b781df0a25d5ba23bd2603b0e3e9bb4731369df
5
6
-What's cooking in git.git (Feb 2011, #01; Thu, 3)
6
+What's cooking in git.git (Feb 2011, #02; Mon, 7)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-The tip of 'next' has been rewound, as 1.7.4 is now out. A few topics
13
-that were merged to 'next' during 1.7.4 pre-release freeze period have
14
-been kicked back to 'pu' to make sure I didn't make silly mistakes while
15
-rebasing them on top of 1.7.4 to reduce future merge conflicts.
12
+--------------------------------------------------
13
+[New Topics]
14
+
15
+* pw/p4 (2011-02-05) 8 commits
16
+ - git-p4: support clone --bare
17
+ - git-p4: decode p4 wildcard characters
18
+ - git-p4: better message for "git-p4 sync" when not cloned
19
+ - git-p4: reinterpret confusing p4 message
20
+ - git-p4: accommodate new move/delete type in p4
21
+ - git-p4: add missing newline in initial import message
22
+ - git-p4: fix key error for p4 problem
23
+ - git-p4: test script
24
+
25
+Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07).
26
27
--------------------------------------------------
28
[Stalled]
@@ -72,15 +82,6 @@ hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
82
outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels
83
safer and saner.
84
75
-* hv/mingw-fs-funnies (2010-12-14) 5 commits
76
- - mingw_rmdir: set errno=ENOTEMPTY when appropriate
77
- - mingw: add fallback for rmdir in case directory is in use
78
- - mingw: make failures to unlink or move raise a question
79
- - mingw: work around irregular failures of unlink on windows
80
- - mingw: move unlink wrapper to mingw.c
81
-
82
-Will be rerolled (Heiko, 2010-12-23)
83
-
85
* mz/rebase (2010-12-28) 31 commits
86
- rebase -i: remove unnecessary state rebase-root
87
- rebase -i: don't read unused variable preserve_merges
@@ -114,109 +115,7 @@ Will be rerolled (Heiko, 2010-12-23)
115
- rebase: refactor reading of state
116
- rebase: clearer names for directory variables
117
117
-Will be rerolled (Martin, Jan 28).
118
-
119
---------------------------------------------------
120
-[Cooking]
121
-
122
-* nd/struct-pathspec (2011-01-31) 22 commits
123
- - t6004: add pathspec globbing test for log family
124
- - t7810: overlapping pathspecs and depth limit
125
- - grep: drop pathspec_matches() in favor of tree_entry_interesting()
126
- - grep: use writable strbuf from caller for grep_tree()
127
- - grep: use match_pathspec_depth() for cache/worktree grepping
128
- - grep: convert to use struct pathspec
129
- - Convert ce_path_match() to use match_pathspec_depth()
130
- - Convert ce_path_match() to use struct pathspec
131
- - struct rev_info: convert prune_data to struct pathspec
132
- - pathspec: add match_pathspec_depth()
133
- - tree_entry_interesting(): optimize wildcard matching when base is matched
134
- - tree_entry_interesting(): support wildcard matching
135
- - tree_entry_interesting(): fix depth limit with overlapping pathspecs
136
- - tree_entry_interesting(): support depth limit
137
- - tree_entry_interesting(): refactor into separate smaller functions
138
- - diff-tree: convert base+baselen to writable strbuf
139
- - glossary: define pathspec
140
- - Move tree_entry_interesting() to tree-walk.c and export it
141
- - tree_entry_interesting(): remove dependency on struct diff_options
142
- - Convert struct diff_options to use struct pathspec
143
- - diff-no-index: use diff_tree_setup_paths()
144
- - Add struct pathspec
145
- (this branch is used by en/object-list-with-pathspec.)
146
-
147
-* en/object-list-with-pathspec (2010-09-20) 2 commits
148
- - Add testcases showing how pathspecs are handled with rev-list --objects
149
- - Make rev-list --objects work together with pathspecs
150
- (this branch uses nd/struct-pathspec.)
151
-
152
-The above two were rebased on 1.7.4; I think the result is correct, but
153
-extra sets of eyeballs are always appreciated.
154
-
155
-* tr/merge-unborn-clobber (2010-08-22) 1 commit
156
- (merged to 'next' on 2011-02-03 at ccfc03d)
157
- + Exhibit merge bug that clobbers index&WT
158
-
159
-* jc/unpack-trees (2010-12-22) 2 commits
160
- (merged to 'next' on 2011-02-03 at 5bd48f8)
161
- + unpack_trees(): skip trees that are the same in all input
162
- + unpack-trees.c: cosmetic fix
163
-
164
-* jc/fsck-fixes (2011-01-26) 2 commits
165
- (merged to 'next' on 2011-02-03 at 98e1c63)
166
- + fsck: do not give up too early in fsck_dir()
167
- + fsck: drop unused parameter from traverse_one_object()
168
-
169
-* tr/diff-words-test (2011-01-18) 4 commits
170
- (merged to 'next' on 2011-02-03 at d346665)
171
- + t4034 (diff --word-diff): add a minimum Perl drier test vector
172
- + t4034 (diff --word-diff): style suggestions
173
- + userdiff: simplify word-diff safeguard
174
- + t4034: bulk verify builtin word regex sanity
175
-
176
-I thought this was Ok; further comments, anybody?
177
-
178
-* rr/fi-import-marks-if-exists (2011-01-15) 1 commit
179
- (merged to 'next' on 2011-02-03 at 8c9d4ce)
180
- + fast-import: Introduce --import-marks-if-exists
181
-
182
-Looked reasonable.
183
-
184
-* jn/unpack-lstat-failure-report (2011-01-12) 2 commits
185
- (merged to 'next' on 2011-02-03 at 76586d2)
186
- + unpack-trees: handle lstat failure for existing file
187
- + unpack-trees: handle lstat failure for existing directory
188
-
189
-Looked reasonable.
190
-
191
-* ef/alias-via-run-command (2011-01-07) 1 commit
192
- (merged to 'next' on 2011-02-03 at 4ce47ce)
193
- + alias: use run_command api to execute aliases
194
-
195
-Will merge to 'master' shortly.
196
-
197
-* uk/checkout-ambiguous-ref (2011-01-11) 1 commit
198
- (merged to 'next' on 2011-02-03 at 9044724)
199
- + checkout: fix bug with ambiguous refs
200
-
201
-Will merge to 'master' shortly.
202
-
203
-* cb/setup (2010-12-27) 1 commit
204
- (merged to 'next' on 2011-02-03 at 073980f)
205
- + setup: translate symlinks in filename when using absolute paths
206
-
207
-Will merge to 'master' shortly.
208
-
209
-* ae/better-template-failure-report (2010-12-18) 1 commit
210
- (merged to 'next' on 2011-02-03 at 3b269c9)
211
- + Improve error messages when temporary file creation fails
212
-
213
-Will merge to 'master' shortly.
214
-
215
-* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
216
- (merged to 'next' on 2011-02-03 at 1c10f16)
217
- + cherry-pick/revert: add support for -X/--strategy-option
218
-
219
-Will merge to 'master' shortly.
118
+Re-roll posted, but I haven't picked it up yet.
119
120
* ab/i18n (2010-10-07) 161 commits
121
- po/de.po: complete German translation
@@ -385,3 +284,115 @@ It is getting ridiculously painful to keep re-resolving the conflicts with
284
other topics in flight, even with the help with rerere.
285
286
Needs a bit more minor work to get the basic code structure right.
287
+
288
+--------------------------------------------------
289
+[Cooking]
290
+
291
+* hv/mingw-fs-funnies (2011-02-07) 5 commits
292
+ - mingw_rmdir: set errno=ENOTEMPTY when appropriate
293
+ - mingw: add fallback for rmdir in case directory is in use
294
+ - mingw: make failures to unlink or move raise a question
295
+ - mingw: work around irregular failures of unlink on windows
296
+ - mingw: move unlink wrapper to mingw.c
297
+
298
+Rerolled and seems ready to move forward. Will merge to 'next'.
299
+
300
+* nd/struct-pathspec (2011-01-31) 22 commits
301
+ - t6004: add pathspec globbing test for log family
302
+ - t7810: overlapping pathspecs and depth limit
303
+ - grep: drop pathspec_matches() in favor of tree_entry_interesting()
304
+ - grep: use writable strbuf from caller for grep_tree()
305
+ - grep: use match_pathspec_depth() for cache/worktree grepping
306
+ - grep: convert to use struct pathspec
307
+ - Convert ce_path_match() to use match_pathspec_depth()
308
+ - Convert ce_path_match() to use struct pathspec
309
+ - struct rev_info: convert prune_data to struct pathspec
310
+ - pathspec: add match_pathspec_depth()
311
+ - tree_entry_interesting(): optimize wildcard matching when base is matched
312
+ - tree_entry_interesting(): support wildcard matching
313
+ - tree_entry_interesting(): fix depth limit with overlapping pathspecs
314
+ - tree_entry_interesting(): support depth limit
315
+ - tree_entry_interesting(): refactor into separate smaller functions
316
+ - diff-tree: convert base+baselen to writable strbuf
317
+ - glossary: define pathspec
318
+ - Move tree_entry_interesting() to tree-walk.c and export it
319
+ - tree_entry_interesting(): remove dependency on struct diff_options
320
+ - Convert struct diff_options to use struct pathspec
321
+ - diff-no-index: use diff_tree_setup_paths()
322
+ - Add struct pathspec
323
+ (this branch is used by en/object-list-with-pathspec.)
324
+
325
+* en/object-list-with-pathspec (2010-09-20) 2 commits
326
+ - Add testcases showing how pathspecs are handled with rev-list --objects
327
+ - Make rev-list --objects work together with pathspecs
328
+ (this branch uses nd/struct-pathspec.)
329
+
330
+The above two were rebased on 1.7.4; will merge to 'next'.
331
+
332
+* tr/merge-unborn-clobber (2010-08-22) 1 commit
333
+ (merged to 'next' on 2011-02-03 at ccfc03d)
334
+ + Exhibit merge bug that clobbers index&WT
335
+
336
+* jc/unpack-trees (2010-12-22) 2 commits
337
+ (merged to 'next' on 2011-02-03 at 5bd48f8)
338
+ + unpack_trees(): skip trees that are the same in all input
339
+ + unpack-trees.c: cosmetic fix
340
+
341
+* jc/fsck-fixes (2011-01-26) 2 commits
342
+ (merged to 'next' on 2011-02-03 at 98e1c63)
343
+ + fsck: do not give up too early in fsck_dir()
344
+ + fsck: drop unused parameter from traverse_one_object()
345
+
346
+* tr/diff-words-test (2011-01-18) 4 commits
347
+ (merged to 'next' on 2011-02-03 at d346665)
348
+ + t4034 (diff --word-diff): add a minimum Perl drier test vector
349
+ + t4034 (diff --word-diff): style suggestions
350
+ + userdiff: simplify word-diff safeguard
351
+ + t4034: bulk verify builtin word regex sanity
352
+
353
+I thought this was Ok; further comments, anybody?
354
+
355
+* rr/fi-import-marks-if-exists (2011-01-15) 1 commit
356
+ (merged to 'next' on 2011-02-03 at 8c9d4ce)
357
+ + fast-import: Introduce --import-marks-if-exists
358
+
359
+Looked reasonable.
360
+
361
+* jn/unpack-lstat-failure-report (2011-01-12) 2 commits
362
+ (merged to 'next' on 2011-02-03 at 76586d2)
363
+ + unpack-trees: handle lstat failure for existing file
364
+ + unpack-trees: handle lstat failure for existing directory
365
+
366
+Looked reasonable.
367
+
368
+* ef/alias-via-run-command (2011-01-07) 1 commit
369
+ (merged to 'next' on 2011-02-03 at 4ce47ce)
370
+ + alias: use run_command api to execute aliases
371
+
372
+Will merge to 'master' shortly.
373
+
374
+* uk/checkout-ambiguous-ref (2011-02-07) 2 commits
375
+ - NEEDS TESTS: commit: document --detach synonym for "git checkout foo^{commit}"
376
+ (merged to 'next' on 2011-02-03 at 9044724)
377
+ + checkout: fix bug with ambiguous refs
378
+
379
+Will merge the first one to 'master' shortly.
380
+
381
+* cb/setup (2010-12-27) 1 commit
382
+ (merged to 'next' on 2011-02-03 at 073980f)
383
+ + setup: translate symlinks in filename when using absolute paths
384
+
385
+Will merge to 'master' shortly.
386
+
387
+* ae/better-template-failure-report (2010-12-18) 1 commit
388
+ (merged to 'next' on 2011-02-03 at 3b269c9)
389
+ + Improve error messages when temporary file creation fails
390
+
391
+Will merge to 'master' shortly.
392
+
393
+* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
394
+ (merged to 'next' on 2011-02-03 at 1c10f16)
395
+ + cherry-pick/revert: add support for -X/--strategy-option
396
+
397
+Will merge to 'master' shortly.
398
+