What's cooking (2012/09 #09)
Junio C Hamano committed
Sep 27, 2012 at 18:23 UTC
9af984e276776c884d79437d761790ed6477ab50
1 file changed
+179
-172
whats-cooking.txt
+179
-172
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2012, #08; Mon, 24)
4
-X-master-at: b5d156c3622fa522966034c78fd6ed9a15504d46
5
-X-next-at: 95625d7562adfba98aa40d9772312bb3c2d92b7f
3
+Subject: What's cooking in git.git (Sep 2012, #09; Thu, 27)
4
+X-master-at: 652398a88e7c3d18b6820a2ae369b05d26dc757f
5
+X-next-at: 5cd6968fc9aa20f71c937328858b2c046ca49038
6
7
-What's cooking in git.git (Sep 2012, #08; Mon, 24)
7
+What's cooking in git.git (Sep 2012, #09; Thu, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -27,40 +27,140 @@ repositories listed at
27
--------------------------------------------------
28
[New Topics]
29
30
-* jc/blame-no-follow (2012-09-21) 2 commits
31
- - blame: pay attention to --no-follow
32
- - diff: accept --no-follow option
33
- (this branch uses jc/blame-follows-renames.)
30
+* da/mergetool-custom (2012-09-25) 1 commit
31
+ (merged to 'next' on 2012-09-27 at f910851)
32
+ + mergetool--lib: Allow custom commands to override built-ins
33
35
- Teaches "--no-follow" option to "git blame" to disable its
36
- whole-file rename detection.
34
+ The actual external command to run for mergetool backend can be
35
+ specified with difftool/mergetool.$name.cmd configuration
36
+ variables, but this mechanism was ignored for the backends we
37
+ natively support.
38
38
- Any comments?
39
40
+* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
41
+ - graph.c: infinite loop in git whatchanged --graph -m
42
41
-* os/commit-submodule-ignore (2012-09-24) 1 commit
42
- - commit: pay attention to submodule.$name.ignore in .gitmodules
43
+ The --graph code fell into infinite loop when asked to do what the
44
+ code did not expect ;-)
45
44
- "git status" honored the ignore=dirty settings in .gitmodules but
45
- "git commit" didn't.
46
+ Anybody who worked on --graph wants to comment?
47
48
48
-* rc/maint-complete-git-p4 (2012-09-24) 1 commit
49
- - Teach git-completion about git p4
49
+* rr/test-use-shell-path-not-shell (2012-09-25) 1 commit
50
+ (merged to 'next' on 2012-09-27 at 3a1848f)
51
+ + test-lib: use $SHELL_PATH, not $SHELL
52
+
53
+ Fixes a brown-paper bag bug.
54
+
55
+ Will merge to 'master'.
56
51
- Will merge to 'next'.
57
58
+* tu/gc-auto-quiet (2012-09-27) 1 commit
59
+ - silence git gc --auto --quiet output
60
54
-* rr/maint-submodule-unknown-cmd (2012-09-24) 2 commits
55
- - [SQUASH] adjust test and doc to "git submodule no-such-subcommand"
56
- - submodule: if $command was not matched, don't parse other args
61
58
- Will merge to 'next' after squashing the tip.
62
+* jk/completion-tests (2012-09-27) 2 commits
63
+ (merged to 'next' on 2012-09-27 at 5cd6968)
64
+ + t9902: add completion tests for "odd" filenames
65
+ + t9902: add a few basic completion tests
66
+
67
+
68
+* jk/lua-hackery (2012-09-25) 5 commits
69
+ - Minimum compilation fixup
70
+ - Makefile: make "lua" a bit more configurable
71
+ - add a "lua" pretty format
72
+ - add basic lua infrastructure
73
+ - pretty: make some commit-parsing helpers more public
74
+
75
+
76
+* jm/diff-context-config (2012-09-27) 2 commits
77
+ - [SQUASH] test fixups
78
+ - diff: diff.context configuration gives default to -U
79
+
80
+
81
+* mh/ceiling (2012-09-27) 8 commits
82
+ - t1504: stop resolving symlinks in GIT_CEILING_DIRECTORIES
83
+ - longest_ancestor_length(): resolve symlinks before comparing paths
84
+ - longest_ancestor_length(): use string_list_longest_prefix()
85
+ - longest_ancestor_length(): always add a slash to the end of prefixes
86
+ - longest_ancestor_length(): explicitly filter list before loop
87
+ - longest_ancestor_length(): use string_list_split()
88
+ - Introduce new function real_path_if_valid()
89
+ - Introduce new static function real_path_internal()
90
+
91
+--------------------------------------------------
92
+[Graduated to "master"]
93
+
94
+* ep/malloc-check-perturb (2012-09-26) 1 commit
95
+ (merged to 'next' on 2012-09-27 at f115b8b)
96
+ + MALLOC_CHECK: enable it, unless disabled explicitly
97
+
98
+ Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
99
+ built-in memory access checking facility GNU libc has.
100
+
101
+ There is a brown-paper bug, whose fix is not yet in 'master' but in
102
+ 'next'.
103
+
104
+
105
+* aj/xfuncname-ada (2012-09-16) 1 commit
106
+ (merged to 'next' on 2012-09-24 at 99fcbb3)
107
+ + Add userdiff patterns for Ada
108
+
109
+
110
+* db/doc-custom-xmlto (2012-09-19) 1 commit
111
+ (merged to 'next' on 2012-09-24 at efcfec1)
112
+ + Documentation/Makefile: Allow custom XMLTO binary
113
+
114
+
115
+* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
116
+ (merged to 'next' on 2012-09-24 at c551c9f)
117
+ + mailinfo: do not concatenate charset= attribute values from mime headers
118
+
119
+ When "git am" is fed an input that has multiple "Content-type: ..."
120
+ header, it did not grok charset= attribute correctly.
121
+
122
+
123
+* js/hp-nonstop (2012-09-19) 1 commit
124
+ (merged to 'next' on 2012-09-24 at 283ac87)
125
+ + Port to HP NonStop
126
+ (this branch uses js/poll-emu.)
127
+
128
+ Port to HP NonStop aka Tandem.
129
+
130
+
131
+* js/poll-emu (2012-09-17) 4 commits
132
+ (merged to 'next' on 2012-09-24 at 32e1601)
133
+ + make poll() work on platforms that can't recv() on a non-socket
134
+ + poll() exits too early with EFAULT if 1st arg is NULL
135
+ + fix some win32 specific dependencies in poll.c
136
+ + make poll available for other platforms lacking it
137
+ (this branch is used by js/hp-nonstop.)
138
+
139
+
140
+* po/maint-docs (2012-09-19) 5 commits
141
+ (merged to 'next' on 2012-09-24 at 9df3935)
142
+ + Doc branch: show -vv option and alternative
143
+ + Doc clean: add See Also link
144
+ + Doc add: link gitignore
145
+ + Doc: separate gitignore pattern sources
146
+ + Doc: shallow clone deepens _to_ new depth
147
+
148
+ Various documentation fixups.
149
+
150
+
151
+* rr/test-make-sure-we-have-git (2012-09-18) 1 commit
152
+ (merged to 'next' on 2012-09-24 at 9e8d28d)
153
+ + t/test-lib: make sure Git has already been built
154
+
155
+ Only the first test t0000 in the test suite made sure we have built
156
+ Git to be tested; move the check to test-lib so that it applies to
157
+ all tests equally.
158
159
--------------------------------------------------
160
[Stalled]
161
63
-* as/check-ignore (2012-09-24) 16 commits
162
+* as/check-ignore (2012-09-27) 17 commits
163
+ - [SQUASH-FIX] 283d072 (Add git-check-ignore sub-command, 2012-09-20)
164
- [SQUASH-FIX] 283d072 (Add git-check-ignore sub-command, 2012-09-20)
165
- [REROLL NEEDED] minimum compilation fix
166
- Add git-check-ignore sub-command
@@ -78,7 +178,6 @@ repositories listed at
178
- Improve documentation and comments regarding directory traversal API
179
- Update directory listing API doc to match code
180
81
- Rerolled.
181
Expecting a further reroll to follow-up review comments.
182
183
@@ -131,20 +230,6 @@ repositories listed at
230
Waiting for comments from mentors and stakeholders.
231
232
134
-* jl/submodule-rm (2012-08-27) 1 commit
135
- - Teach rm to remove submodules unless they contain a git directory
136
-
137
- "git rm submodule" cannot blindly remove a submodule directory as
138
- its working tree may have local changes, and worse yet, it may even
139
- have its repository embedded in it. Teach it some special cases
140
- where it is safe to remove a submodule, specifically, when there is
141
- no local changes in the submodule working tree, and its repository
142
- is not embedded in its working tree but is elsewhere and uses the
143
- gitfile mechanism to point at it.
144
-
145
- Replacement sent but was still iffy around conflicted merge cases.
146
-
147
-
233
* ph/credential-refactor (2012-09-02) 5 commits
234
- wincred: port to generic credential helper
235
- Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
@@ -260,50 +345,69 @@ repositories listed at
345
--------------------------------------------------
346
[Cooking]
347
263
-* js/rebase-exec-command-not-found (2012-09-18) 1 commit
264
- (merged to 'next' on 2012-09-24 at ed5b048)
265
- + rebase -i: fix misleading error message after 'exec no-such' instruction
348
+* jl/submodule-rm (2012-09-27) 1 commit
349
+ - Teach rm to remove submodules unless they contain a git directory
350
267
- Will merge to 'master'.
351
+ "git rm submodule" cannot blindly remove a submodule directory as
352
+ its working tree may have local changes, and worse yet, it may even
353
+ have its repository embedded in it. Teach it some special cases
354
+ where it is safe to remove a submodule, specifically, when there is
355
+ no local changes in the submodule working tree, and its repository
356
+ is not embedded in its working tree but is elsewhere and uses the
357
+ gitfile mechanism to point at it.
358
359
270
-* rr/test-make-sure-we-have-git (2012-09-18) 1 commit
271
- (merged to 'next' on 2012-09-24 at 9e8d28d)
272
- + t/test-lib: make sure Git has already been built
360
+* nd/wildmatch (2012-09-27) 5 commits
361
+ - Support "**" in .gitignore and .gitattributes patterns using wildmatch()
362
+ - Integrate wildmatch to git
363
+ - compat/wildmatch: fix case-insensitive matching
364
+ - compat/wildmatch: remove static variable force_lower_case
365
+ - Import wildmatch from rsync
366
274
- Only the first test t0000 in the test suite made sure we have built
275
- Git to be tested; move the check to test-lib so that it applies to
276
- all tests equally.
367
+ Allows pathname patterns in .gitignore and .gitattributes files
368
+ with double-asterisks "foo/**/bar" to match any number of directory
369
+ hiearchies.
370
278
- Will merge to 'master'.
371
+ It was pointed out that some symbols that do not have to be global
372
+ are left global. I think this reroll fixed most of them.
373
374
281
-* db/doc-custom-xmlto (2012-09-19) 1 commit
282
- (merged to 'next' on 2012-09-24 at efcfec1)
283
- + Documentation/Makefile: Allow custom XMLTO binary
375
+* jc/blame-no-follow (2012-09-21) 2 commits
376
+ - blame: pay attention to --no-follow
377
+ - diff: accept --no-follow option
378
+ (this branch uses jc/blame-follows-renames.)
379
285
- Will merge to 'master'.
380
+ Teaches "--no-follow" option to "git blame" to disable its
381
+ whole-file rename detection.
382
383
+ Any comments?
384
288
-* js/hp-nonstop (2012-09-19) 1 commit
289
- (merged to 'next' on 2012-09-24 at 283ac87)
290
- + Port to HP NonStop
291
- (this branch uses js/poll-emu.)
385
293
- Port to HP NonStop aka Tandem.
386
+* os/commit-submodule-ignore (2012-09-24) 1 commit
387
+ (merged to 'next' on 2012-09-27 at 9cd2cfd)
388
+ + commit: pay attention to submodule.$name.ignore in .gitmodules
389
295
- Will merge to 'master'.
390
+ "git status" honored the ignore=dirty settings in .gitmodules but
391
+ "git commit" didn't.
392
393
298
-* po/maint-docs (2012-09-19) 5 commits
299
- (merged to 'next' on 2012-09-24 at 9df3935)
300
- + Doc branch: show -vv option and alternative
301
- + Doc clean: add See Also link
302
- + Doc add: link gitignore
303
- + Doc: separate gitignore pattern sources
304
- + Doc: shallow clone deepens _to_ new depth
394
+* rc/maint-complete-git-p4 (2012-09-24) 1 commit
395
+ (merged to 'next' on 2012-09-25 at 116e58f)
396
+ + Teach git-completion about git p4
397
306
- Various documentation fixups.
398
+ Comment from Pete will need to be addressed in a follow-up patch.
399
+
400
+
401
+* rr/maint-submodule-unknown-cmd (2012-09-25) 1 commit
402
+ (merged to 'next' on 2012-09-25 at 4bb1bc4)
403
+ + submodule: if $command was not matched, don't parse other args
404
+
405
+ Will merge to 'master'.
406
+
407
+
408
+* js/rebase-exec-command-not-found (2012-09-18) 1 commit
409
+ (merged to 'next' on 2012-09-24 at ed5b048)
410
+ + rebase -i: fix misleading error message after 'exec no-such' instruction
411
412
Will merge to 'master'.
413
@@ -350,19 +454,19 @@ repositories listed at
454
455
456
* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
353
- - receive-pack: drop "n/a" on unpacker errors
354
- - receive-pack: send pack-processing stderr over sideband
355
- - receive-pack: redirect unpack-objects stdout to /dev/null
457
+ (merged to 'next' on 2012-09-27 at 90f0c6f)
458
+ + receive-pack: drop "n/a" on unpacker errors
459
+ + receive-pack: send pack-processing stderr over sideband
460
+ + receive-pack: redirect unpack-objects stdout to /dev/null
461
462
Send errors from "unpack-objects" and "index-pack" back to the "git
463
push" over the git and smart-http protocols, just like it is done
464
for a push over the ssh protocol.
465
361
- Will merge to 'next'.
362
-
466
467
* jc/blame-follows-renames (2012-09-21) 1 commit
365
- - git blame: document that it always follows origin across whole-file renames
468
+ (merged to 'next' on 2012-09-27 at 12634c1)
469
+ + git blame: document that it always follows origin across whole-file renames
470
(this branch is used by jc/blame-no-follow.)
471
472
Clarify the "blame" documentation to tell the users that there is
@@ -370,31 +474,12 @@ repositories listed at
474
475
476
* rt/maint-clone-single (2012-09-20) 1 commit
373
- - clone --single: limit the fetch refspec to fetched branch
477
+ (merged to 'next' on 2012-09-27 at a47d54d)
478
+ + clone --single: limit the fetch refspec to fetched branch
479
480
Running "git fetch" in a repository made with "git clone --single"
481
slurps all the branches, defeating the point of "--single".
482
378
- Will merge to 'next'.
379
-
380
-
381
-* ep/malloc-check-perturb (2012-09-17) 2 commits
382
- (merged to 'next' on 2012-09-24 at c490ea5)
383
- + MALLOC_CHECK: various clean-ups
384
- + Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
385
-
386
- Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
387
- built-in memory access checking facility GNU libc has.
388
-
389
- Will merge to 'master'.
390
-
391
-
392
-* aj/xfuncname-ada (2012-09-16) 1 commit
393
- (merged to 'next' on 2012-09-24 at 99fcbb3)
394
- + Add userdiff patterns for Ada
395
-
396
- Will merge to 'master'.
397
-
483
484
* aw/rebase-i-edit-todo (2012-09-19) 5 commits
485
(merged to 'next' on 2012-09-24 at 95625d7)
@@ -407,43 +492,6 @@ repositories listed at
492
Will merge to 'master'.
493
494
410
-* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
411
- (merged to 'next' on 2012-09-24 at c551c9f)
412
- + mailinfo: do not concatenate charset= attribute values from mime headers
413
-
414
- When "git am" is fed an input that has multiple "Content-type: ..."
415
- header, it did not grok charset= attribute correctly.
416
-
417
- Will merge to 'master'.
418
-
419
-
420
-* js/poll-emu (2012-09-17) 4 commits
421
- (merged to 'next' on 2012-09-24 at 32e1601)
422
- + make poll() work on platforms that can't recv() on a non-socket
423
- + poll() exits too early with EFAULT if 1st arg is NULL
424
- + fix some win32 specific dependencies in poll.c
425
- + make poll available for other platforms lacking it
426
- (this branch is used by js/hp-nonstop.)
427
-
428
- Will merge to 'master'.
429
-
430
-
431
-* nd/wildmatch (2012-09-17) 5 commits
432
- - Support "**" in .gitignore and .gitattributes patterns using wildmatch()
433
- - Integrate wildmatch to git
434
- - compat/wildmatch: fix case-insensitive matching
435
- - compat/wildmatch: remove static variable force_lower_case
436
- - Import wildmatch from rsync
437
-
438
- Allows pathname patterns in .gitignore and .gitattributes files
439
- with double-asterisks "foo/**/bar" to match any number of directory
440
- hiearchies.
441
-
442
- It was pointed out that some symbols that do not have to be global
443
- are left global.
444
- Will wait for a reroll.
445
-
446
-
495
* jc/maint-name-rev (2012-09-17) 7 commits
496
- describe --contains: use "name-rev --algorithm=weight"
497
- name-rev --algorithm=weight: tests and documentation
@@ -494,44 +542,3 @@ repositories listed at
542
543
Will defer until the end of the 2012.
544
while waiting for older "less" to go extinct.
497
-
498
---------------------------------------------------
499
-[Discarded]
500
-
501
-* tg/index-v5 (2012-08-17) 13 commits
502
- . p0002-index.sh: add perf test for the index formats
503
- . update-index.c: rewrite index when index-version is given
504
- . Write resolve-undo data for index-v5
505
- . Write index-v5 cache-tree data
506
- . Write index-v5
507
- . Read cache-tree in index-v5
508
- . Read resolve-undo data
509
- . Read index-v5
510
- . Make in-memory format aware of stat_crc
511
- . Add documentation of the index-v5 file format
512
- . t2104: Don't fail for index versions other than [23]
513
- . read-cache.c: Re-read index if index file changed
514
- . Move index v2 specific functions to their own file
515
-
516
- A GSoC project. Was waiting for comments from mentors and
517
- stakeholders, but nothing seems to be happening, other than breakage
518
- fixes on Cygwin.
519
-
520
- Discarded without prejudice.
521
-
522
-
523
-* mz/rebase-range (2012-07-18) 7 commits
524
- . rebase (without -p): correctly calculate patches to rebase
525
- . rebase -p: don't request --left-right only to ignore left side
526
- . rebase -p: use --cherry-mark for todo file
527
- . git-rebase--interactive.sh: look up subject in add_pick_line
528
- . git-rebase--interactive: group all $preserve_merges code
529
- . git-rebase--interactive.sh: extract function for adding "pick" line
530
- . git-rebase--am.sh: avoid special-casing --keep-empty
531
-
532
- Expecting a reroll.
533
-
534
- Performance concerns from Windows folks. Also the series lacks
535
- proper sign-offs.
536
-
537
- Discarded without prejudice.