What's cooking (2011/02 #03)
Junio C Hamano committed
Feb 9, 2011 at 18:02 UTC
693b4428fee0152d773fb5a7920eb9130e3253fb
1 file changed
+131
-116
whats-cooking.txt
+131
-116
@@ -1,28 +1,88 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2011, #02; Mon, 7)
3
-X-master-at: 7811d9600f02e70c9f835719c71156c967a684f7
4
-X-next-at: 3b781df0a25d5ba23bd2603b0e3e9bb4731369df
2
+Subject: What's cooking in git.git (Feb 2011, #03; Wed, 9)
3
+X-master-at: 1a9fe453263137be7d42e6fbfc041b5b2d9521d7
4
+X-next-at: 3d0bb1aecb5960274bb37fb5692cb0f4b10d7706
5
6
-What's cooking in git.git (Feb 2011, #02; Mon, 7)
6
+What's cooking in git.git (Feb 2011, #03; Wed, 9)
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 'maint' branch has accumulated enough minor fixes to produce 1.7.4.1,
13
+perhaps by the end of this week.
14
+
15
--------------------------------------------------
16
[New Topics]
17
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
18
+* jh/merge-sans-branch (2011-02-08) 3 commits
19
+ - merge: optionally merge from upstream when run without argument
20
+ - builtin/merge.c: Add function per_branch_config
21
+ - builtin/merge.c: Add setup_merge_commit function
22
25
-Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07).
23
+* js/checkout-untracked-symlink (2011-02-05) 2 commits
24
+ - (weatherbaloon) needs in-code explanation updates
25
+ - Demonstrate breakage: checkout overwrites untracked symlink with directory
26
+
27
+* lp/config-vername-check (2011-01-21) 2 commits
28
+ - Documentation fixes in git-config
29
+ - Sanity-check config variable names
30
+
31
+* mz/rerere-remaining (2011-02-07) 1 commit
32
+ - mergetool: don't skip modify/remove conflicts
33
+ (this branch uses jc/rerere-remaining.)
34
+
35
+* nd/hash-object-sanity (2011-02-05) 1 commit
36
+ - Make hash-object more robust against malformed objects
37
+
38
+--------------------------------------------------
39
+[Graduated to "master"]
40
+
41
+* ae/better-template-failure-report (2010-12-18) 1 commit
42
+ (merged to 'next' on 2011-02-03 at 3b269c9)
43
+ + Improve error messages when temporary file creation fails
44
+
45
+* cb/setup (2010-12-27) 1 commit
46
+ (merged to 'next' on 2011-02-03 at 073980f)
47
+ + setup: translate symlinks in filename when using absolute paths
48
+
49
+* ef/alias-via-run-command (2011-01-07) 1 commit
50
+ (merged to 'next' on 2011-02-03 at 4ce47ce)
51
+ + alias: use run_command api to execute aliases
52
+
53
+* jc/fsck-fixes (2011-01-26) 2 commits
54
+ (merged to 'next' on 2011-02-03 at 98e1c63)
55
+ + fsck: do not give up too early in fsck_dir()
56
+ + fsck: drop unused parameter from traverse_one_object()
57
+
58
+* jc/unpack-trees (2010-12-22) 2 commits
59
+ (merged to 'next' on 2011-02-03 at 5bd48f8)
60
+ + unpack_trees(): skip trees that are the same in all input
61
+ + unpack-trees.c: cosmetic fix
62
+
63
+* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
64
+ (merged to 'next' on 2011-02-03 at 1c10f16)
65
+ + cherry-pick/revert: add support for -X/--strategy-option
66
+
67
+* jn/unpack-lstat-failure-report (2011-01-12) 2 commits
68
+ (merged to 'next' on 2011-02-03 at 76586d2)
69
+ + unpack-trees: handle lstat failure for existing file
70
+ + unpack-trees: handle lstat failure for existing directory
71
+
72
+* rr/fi-import-marks-if-exists (2011-01-15) 1 commit
73
+ (merged to 'next' on 2011-02-03 at 8c9d4ce)
74
+ + fast-import: Introduce --import-marks-if-exists
75
+
76
+* tr/diff-words-test (2011-01-18) 4 commits
77
+ (merged to 'next' on 2011-02-03 at d346665)
78
+ + t4034 (diff --word-diff): add a minimum Perl drier test vector
79
+ + t4034 (diff --word-diff): style suggestions
80
+ + userdiff: simplify word-diff safeguard
81
+ + t4034: bulk verify builtin word regex sanity
82
+
83
+* tr/merge-unborn-clobber (2010-08-22) 1 commit
84
+ (merged to 'next' on 2011-02-03 at ccfc03d)
85
+ + Exhibit merge bug that clobbers index&WT
86
87
--------------------------------------------------
88
[Stalled]
@@ -63,12 +123,6 @@ IIRC, this was a weather-baloon "if you wanted to, this may be how you
123
would do it" without test updates. People who care need to help moving
124
things forward.
125
66
-* jc/rerere-remaining (2011-01-06) 1 commit
67
- - rerere "remaining"
68
-
69
-Just a handful of weatherballoon patches without proper tests, in response
70
-to feature/minor fix requests.
71
-
126
* ab/p4 (2011-01-11) 1 commit
127
- git-p4: correct indenting and formatting
128
@@ -288,111 +342,72 @@ Needs a bit more minor work to get the basic code structure right.
342
--------------------------------------------------
343
[Cooking]
344
345
+* jc/rerere-remaining (2011-01-06) 1 commit
346
+ - rerere "remaining"
347
+ (this branch is used by mz/rerere-remaining.)
348
+
349
+Just a handful of weatherballoon patches without proper tests, in response
350
+to feature/minor fix requests.
351
+
352
+* pw/p4 (2011-02-05) 8 commits
353
+ - git-p4: support clone --bare
354
+ - git-p4: decode p4 wildcard characters
355
+ - git-p4: better message for "git-p4 sync" when not cloned
356
+ - git-p4: reinterpret confusing p4 message
357
+ - git-p4: accommodate new move/delete type in p4
358
+ - git-p4: add missing newline in initial import message
359
+ - git-p4: fix key error for p4 problem
360
+ - git-p4: test script
361
+
362
+Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07).
363
+
364
* 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
365
+ (merged to 'next' on 2011-02-09 at 3d0bb1a)
366
+ + mingw_rmdir: set errno=ENOTEMPTY when appropriate
367
+ + mingw: add fallback for rmdir in case directory is in use
368
+ + mingw: make failures to unlink or move raise a question
369
+ + mingw: work around irregular failures of unlink on windows
370
+ + mingw: move unlink wrapper to mingw.c
371
298
-Rerolled and seems ready to move forward. Will merge to 'next'.
372
+Rerolled and seems ready to move forward.
373
374
* 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
375
+ (merged to 'next' on 2011-02-09 at b1e64ee)
376
+ + t6004: add pathspec globbing test for log family
377
+ + t7810: overlapping pathspecs and depth limit
378
+ + grep: drop pathspec_matches() in favor of tree_entry_interesting()
379
+ + grep: use writable strbuf from caller for grep_tree()
380
+ + grep: use match_pathspec_depth() for cache/worktree grepping
381
+ + grep: convert to use struct pathspec
382
+ + Convert ce_path_match() to use match_pathspec_depth()
383
+ + Convert ce_path_match() to use struct pathspec
384
+ + struct rev_info: convert prune_data to struct pathspec
385
+ + pathspec: add match_pathspec_depth()
386
+ + tree_entry_interesting(): optimize wildcard matching when base is matched
387
+ + tree_entry_interesting(): support wildcard matching
388
+ + tree_entry_interesting(): fix depth limit with overlapping pathspecs
389
+ + tree_entry_interesting(): support depth limit
390
+ + tree_entry_interesting(): refactor into separate smaller functions
391
+ + diff-tree: convert base+baselen to writable strbuf
392
+ + glossary: define pathspec
393
+ + Move tree_entry_interesting() to tree-walk.c and export it
394
+ + tree_entry_interesting(): remove dependency on struct diff_options
395
+ + Convert struct diff_options to use struct pathspec
396
+ + diff-no-index: use diff_tree_setup_paths()
397
+ + Add struct pathspec
398
(this branch is used by en/object-list-with-pathspec.)
399
400
* 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
401
+ (merged to 'next' on 2011-02-09 at ccf6c6a)
402
+ + Add testcases showing how pathspecs are handled with rev-list --objects
403
+ + Make rev-list --objects work together with pathspecs
404
(this branch uses nd/struct-pathspec.)
405
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}"
406
+* uk/checkout-ambiguous-ref (2011-02-08) 4 commits
407
+ - checkout: rearrange update_refs_for_switch for clarity
408
+ - checkout: introduce --detach synonym for "git checkout foo^{commit}"
409
+ - checkout: split off a function to peel away branchname arg
410
(merged to 'next' on 2011-02-03 at 9044724)
411
+ checkout: fix bug with ambiguous refs
412
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
-
413
+The topic has become about "checkout --detach" ;-).