What's cooking (2012/09 #10)

Junio C Hamano committed Sep 30, 2012 at 21:33 UTC 95649dee40b65455c9c33795d44e149e49f367f7
1 file changed +214 -222
whats-cooking.txt
+214 -222
@@ -1,18 +1,17 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Sep 2012, #09; Thu, 27)
4 -X-master-at: 652398a88e7c3d18b6820a2ae369b05d26dc757f
5 -X-next-at: 5cd6968fc9aa20f71c937328858b2c046ca49038
3 +Subject: What's cooking in git.git (Sep 2012, #10; Sun, 30)
4 +X-master-at: 261b5119c7a7cb778dd812cfb006b511c5bc4065
5 +X-next-at: 8e89b3c30625b00571c4cbc5e5a74d8e3e442754
6
7 -What's cooking in git.git (Sep 2012, #09; Thu, 27)
7 +What's cooking in git.git (Sep 2012, #10; Sun, 30)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
12 '+' are in 'next'.
13
14 -Feedback from contributors and reviewers involved in topics in the
15 -"stalled" category is sorely needed to help them get unstuck.
14 +The tip of 'master' will be tagged as 1.8.0-rc0 real soon now.
15
16 I'm planning to keep this cycle reasonably short and aim for tagging
17 the result as 1.8.0 at the end of 9th week, on October 21st, after
@@ -25,139 +24,133 @@ repositories listed at
24 http://git-blame.blogspot.com/p/git-public-repositories.html
25
26 --------------------------------------------------
28 -[New Topics]
29 -
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 -
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 -
39 -
40 -* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
41 - - graph.c: infinite loop in git whatchanged --graph -m
27 +[Graduated to "master"]
28
43 - The --graph code fell into infinite loop when asked to do what the
44 - code did not expect ;-)
29 +* aw/rebase-i-edit-todo (2012-09-19) 5 commits
30 + (merged to 'next' on 2012-09-24 at 95625d7)
31 + + rebase -i: suggest using --edit-todo to fix an unknown instruction
32 + + rebase -i: Add tests for "--edit-todo"
33 + + rebase -i: Teach "--edit-todo" action
34 + + rebase -i: Refactor help messages for todo file
35 + + rebase usage: subcommands can not be combined with -i
36
46 - Anybody who worked on --graph wants to comment?
37 + Teach an option to edit the insn sheet to "git rebase -i".
38
39
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
40 +* jk/smart-http-switch (2012-09-21) 2 commits
41 + (merged to 'next' on 2012-09-24 at b2a2777)
42 + + remote-curl: let users turn off smart http
43 + + remote-curl: rename is_http variable
44 + (this branch uses sp/maint-http-info-refs-no-retry.)
45
53 - Fixes a brown-paper bag bug.
46 + Allows users to turn off smart-http when talking to dumb-only
47 + servers.
48
55 - Will merge to 'master'.
49
50 +* js/rebase-exec-command-not-found (2012-09-18) 1 commit
51 + (merged to 'next' on 2012-09-24 at ed5b048)
52 + + rebase -i: fix misleading error message after 'exec no-such' instruction
53
58 -* tu/gc-auto-quiet (2012-09-27) 1 commit
59 - - silence git gc --auto --quiet output
54 + When you misspell the command name you give to the "exec" action in
55 + the "git rebase -i" insn sheet, you are told that 'rebase' is not a
56 + git subcommand from "git rebase --continue".
57
58
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
59 +* rr/maint-submodule-unknown-cmd (2012-09-25) 1 commit
60 + (merged to 'next' on 2012-09-25 at 4bb1bc4)
61 + + submodule: if $command was not matched, don't parse other args
62
63 + "git submodule frotz" was not diagnosed as "frotz" being an unknown
64 + subcommand to "git submodule"; the user instead got a complaint
65 + that "git submodule status" was run with an unknown path "frotz".
66
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
67
68 +* rr/test-use-shell-path-not-shell (2012-09-25) 1 commit
69 + (merged to 'next' on 2012-09-27 at 3a1848f)
70 + + test-lib: use $SHELL_PATH, not $SHELL
71
76 -* jm/diff-context-config (2012-09-27) 2 commits
77 - - [SQUASH] test fixups
78 - - diff: diff.context configuration gives default to -U
72
73 +* rs/archive-zip-utf8 (2012-09-24) 4 commits
74 + (merged to 'next' on 2012-09-24 at 9b42b1c)
75 + + archive-zip: write extended timestamp
76 + + archive-zip: support UTF-8 paths
77 + + Revert "archive-zip: support UTF-8 paths"
78 + (merged to 'next' on 2012-09-11 at 3b1f071)
79 + + archive-zip: support UTF-8 paths
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()
81 + With another reroll, it looks like the series is as polished as it
82 + could be.
83
91 ---------------------------------------------------
92 -[Graduated to "master"]
84
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
85 +* sp/maint-http-enable-gzip (2012-09-20) 1 commit
86 + (merged to 'next' on 2012-09-24 at 1d05142)
87 + + Enable info/refs gzip decompression in HTTP client
88
98 - Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
99 - built-in memory access checking facility GNU libc has.
89 + Allows a more common 'gzip' Accept-Encoding to be used.
90
101 - There is a brown-paper bug, whose fix is not yet in 'master' but in
102 - 'next'.
91
92 +* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
93 + (merged to 'next' on 2012-09-24 at ebcce8e)
94 + + Revert "retry request without query when info/refs?query fails"
95 + (this branch is used by jk/smart-http-switch.)
96
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
97 + Kills an old workaround for an unlikely server misconfiguration
98 + that hurts debuggability.
99
100 +--------------------------------------------------
101 +[New Topics]
102
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
103 +* jl/submodule-add-by-name (2012-09-30) 2 commits
104 + - submodule add: Fail when .git/modules/<name> already exists unless forced
105 + - Teach "git submodule add" the --name option
106
107 + If you remove a submodule, in order to keep the repository so that
108 + "git checkout" to an older commit in the superproject history can
109 + resurrect the submodule, the real repository will stay in $GIT_DIR
110 + of the superproject. A later "git submodule add $path" to add a
111 + different submodule at the same path will fail. Diagnose this case
112 + a bit better, and if the user really wants to add an unrelated
113 + submodule at the same path, give the "--name" option to give it a
114 + place in $GIT_DIR of the superproject that does not conflict with
115 + the original submodule.
116
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
117
119 - When "git am" is fed an input that has multiple "Content-type: ..."
120 - header, it did not grok charset= attribute correctly.
118 +* nd/grep-reflog (2012-09-29) 4 commits
119 + - revision: make --grep search in notes too if shown
120 + - log --grep-reflog: reject the option without -g
121 + - revision: add --grep-reflog to filter commits by reflog messages
122 + - grep: prepare for new header field filter
123
124 + Teach the commands from the "log" family the "--grep-reflog" option
125 + to limit output by string that appears in the reflog entry when the
126 + --walk-reflogs option is in effect.
127
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.)
128
128 - Port to HP NonStop aka Tandem.
129 +* ep/malloc-check-perturb (2012-09-26) 1 commit
130 + (merged to 'next' on 2012-09-27 at f115b8b)
131 + + MALLOC_CHECK: enable it, unless disabled explicitly
132
133 + Fixes a brown-paper bag bug.
134
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.)
135 + Will merge to 'master'.
136
137
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
138 +* lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit
139 + - mailinfo: don't require "text" mime type for attachments
140
148 - Various documentation fixups.
141 + A patch attached as application/octet-stream (e.g. not text/*) were
142 + mishandled,not correctly honoring Content-Transfer-Encoding
143 + (e.g. base64).
144
145 +--------------------------------------------------
146 +[Stalled]
147
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
148 +* rc/maint-complete-git-p4 (2012-09-24) 1 commit
149 + (merged to 'next' on 2012-09-25 at 116e58f)
150 + + Teach git-completion about git p4
151
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.
152 + Comment from Pete will need to be addressed in a follow-up patch.
153
159 ---------------------------------------------------
160 -[Stalled]
154
155 * as/check-ignore (2012-09-27) 17 commits
156 - [SQUASH-FIX] 283d072 (Add git-check-ignore sub-command, 2012-09-20)
@@ -230,6 +223,50 @@ repositories listed at
223 Waiting for comments from mentors and stakeholders.
224
225
226 +* jc/maint-name-rev (2012-09-17) 7 commits
227 + - describe --contains: use "name-rev --algorithm=weight"
228 + - name-rev --algorithm=weight: tests and documentation
229 + - name-rev --algorithm=weight: cache the computed weight in notes
230 + - name-rev --algorithm=weight: trivial optimization
231 + - name-rev: --algorithm option
232 + - name_rev: clarify the logic to assign a new tip-name to a commit
233 + - name-rev: lose unnecessary typedef
234 +
235 + "git name-rev" names the given revision based on a ref that can be
236 + reached in the smallest number of steps from the rev, but that is
237 + not useful when the caller wants to know which tag is the oldest one
238 + that contains the rev. This teaches a new mode to the command that
239 + uses the oldest ref among those which contain the rev.
240 +
241 + I am not sure if this is worth it; for one thing, even with the help
242 + from notes-cache, it seems to make the "describe --contains" even
243 + slower. Also the command will be unusably slow for a user who does
244 + not have a write access (hence unable to create or update the
245 + notes-cache).
246 +
247 + Stalled mostly due to lack of responses.
248 +
249 +
250 +* jc/xprm-generation (2012-09-14) 1 commit
251 + - test-generation: compute generation numbers and clock skews
252 +
253 + A toy to analyze how bad the clock skews are in histories of real
254 + world projects.
255 +
256 + Stalled mostly due to lack of responses.
257 +
258 +
259 +* jc/blame-no-follow (2012-09-21) 2 commits
260 + - blame: pay attention to --no-follow
261 + - diff: accept --no-follow option
262 + (this branch uses jc/blame-follows-renames.)
263 +
264 + Teaches "--no-follow" option to "git blame" to disable its
265 + whole-file rename detection.
266 +
267 + Stalled mostly due to lack of responses.
268 +
269 +
270 * ph/credential-refactor (2012-09-02) 5 commits
271 - wincred: port to generic credential helper
272 - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
@@ -345,8 +382,68 @@ repositories listed at
382 --------------------------------------------------
383 [Cooking]
384
348 -* jl/submodule-rm (2012-09-27) 1 commit
349 - - Teach rm to remove submodules unless they contain a git directory
385 +* da/mergetool-custom (2012-09-25) 1 commit
386 + (merged to 'next' on 2012-09-27 at f910851)
387 + + mergetool--lib: Allow custom commands to override built-ins
388 +
389 + The actual external command to run for mergetool backend can be
390 + specified with difftool/mergetool.$name.cmd configuration
391 + variables, but this mechanism was ignored for the backends we
392 + natively support.
393 +
394 + Will merge to 'master'.
395 +
396 +
397 +* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
398 + - graph.c: infinite loop in git whatchanged --graph -m
399 +
400 + The --graph code fell into infinite loop when asked to do what the
401 + code did not expect ;-)
402 +
403 + Anybody who worked on --graph wants to comment?
404 +
405 +
406 +* tu/gc-auto-quiet (2012-09-27) 1 commit
407 + - silence git gc --auto --quiet output
408 +
409 + Will merge to 'next'.
410 +
411 +
412 +* jk/completion-tests (2012-09-27) 2 commits
413 + (merged to 'next' on 2012-09-27 at 5cd6968)
414 + + t9902: add completion tests for "odd" filenames
415 + + t9902: add a few basic completion tests
416 +
417 + Will merge to 'master'.
418 +
419 +
420 +* jm/diff-context-config (2012-09-27) 2 commits
421 + - [SQUASH] test fixups
422 + - diff: diff.context configuration gives default to -U
423 +
424 + Will merge to 'next' after squashing.
425 +
426 +
427 +* mh/ceiling (2012-09-29) 9 commits
428 + - t1504: stop resolving symlinks in GIT_CEILING_DIRECTORIES
429 + - longest_ancestor_length(): resolve symlinks before comparing paths
430 + - longest_ancestor_length(): use string_list_longest_prefix()
431 + - longest_ancestor_length(): always add a slash to the end of prefixes
432 + - longest_ancestor_length(): explicitly filter list before loop
433 + - longest_ancestor_length(): use string_list_split()
434 + - Introduce new function real_path_if_valid()
435 + - real_path_internal(): add comment explaining use of cwd
436 + - Introduce new static function real_path_internal()
437 +
438 + Elements of GIT_CEILING_DIRECTORIES list may not match the real
439 + pathname we obtain from getcwd(), leading the GIT_DIR discovery
440 + logic to escape the ceilings the user thought to have specified.
441 +
442 + The solution felt a bit unnecessarily convoluted to me.
443 +
444 +
445 +* jl/submodule-rm (2012-09-29) 1 commit
446 + - submodule: teach rm to remove submodules unless they contain a git directory
447
448 "git rm submodule" cannot blindly remove a submodule directory as
449 its working tree may have local changes, and worse yet, it may even
@@ -356,6 +453,8 @@ repositories listed at
453 is not embedded in its working tree but is elsewhere and uses the
454 gitfile mechanism to point at it.
455
456 + Will merge to 'next'.
457 +
458
459 * nd/wildmatch (2012-09-27) 5 commits
460 - Support "**" in .gitignore and .gitattributes patterns using wildmatch()
@@ -372,17 +471,6 @@ repositories listed at
471 are left global. I think this reroll fixed most of them.
472
473
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 -
380 - Teaches "--no-follow" option to "git blame" to disable its
381 - whole-file rename detection.
382 -
383 - Any comments?
384 -
385 -
474 * os/commit-submodule-ignore (2012-09-24) 1 commit
475 (merged to 'next' on 2012-09-27 at 9cd2cfd)
476 + commit: pay attention to submodule.$name.ignore in .gitmodules
@@ -390,68 +478,20 @@ repositories listed at
478 "git status" honored the ignore=dirty settings in .gitmodules but
479 "git commit" didn't.
480
393 -
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 -
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 -
481 Will merge to 'master'.
482
483
415 -* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
416 - (merged to 'next' on 2012-09-24 at ebcce8e)
417 - + Revert "retry request without query when info/refs?query fails"
418 - (this branch is used by jk/smart-http-switch.)
419 -
420 - Kills an old workaround for a unlikely server misconfiguration that
421 - hurts debuggability.
422 -
423 - Will merge to 'master'.
424 -
425 -
426 -* jk/smart-http-switch (2012-09-21) 2 commits
427 - (merged to 'next' on 2012-09-24 at b2a2777)
428 - + remote-curl: let users turn off smart http
429 - + remote-curl: rename is_http variable
430 - (this branch uses sp/maint-http-info-refs-no-retry.)
431 -
432 - Allows users to turn off smart-http when talking to dumb-only
433 - servers.
434 -
435 - Will merge to 'master'.
436 -
437 -
438 -* sp/maint-http-enable-gzip (2012-09-20) 1 commit
439 - (merged to 'next' on 2012-09-24 at 1d05142)
440 - + Enable info/refs gzip decompression in HTTP client
441 -
442 - Allows a more common 'gzip' Accept-Encoding to be used.
443 -
444 - Will merge to 'master'.
445 -
446 -
447 -* nd/pretty-placeholder-with-color-option (2012-09-20) 4 commits
448 - - [SQUASH] do not use real-sb without initializing
449 - - pretty: support right alignment
450 - - pretty: support placeholders %C+ and %C-
484 +* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
485 + - pretty: support %>> that steal trailing spaces
486 + - pretty: support truncating in %>, %< and %><
487 + - pretty: support padding placeholders, %< %> and %><
488 + - pretty: two phase conversion for non utf-8 commits
489 + - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
490 + - utf8.c: move display_mode_esc_sequence_len() for use by other functions
491 + - pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)
492 + - pretty: split parsing %C into a separate function
493 - pretty: share code between format_decoration and show_decorations
494
453 - Rerolled, but haven't picked it up yet.
454 -
495
496 * jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
497 (merged to 'next' on 2012-09-27 at 90f0c6f)
@@ -463,6 +503,8 @@ repositories listed at
503 push" over the git and smart-http protocols, just like it is done
504 for a push over the ssh protocol.
505
506 + Will merge to 'master'.
507 +
508
509 * jc/blame-follows-renames (2012-09-21) 1 commit
510 (merged to 'next' on 2012-09-27 at 12634c1)
@@ -472,6 +514,8 @@ repositories listed at
514 Clarify the "blame" documentation to tell the users that there is
515 no need to ask for "--follow".
516
517 + Will merge to 'master'.
518 +
519
520 * rt/maint-clone-single (2012-09-20) 1 commit
521 (merged to 'next' on 2012-09-27 at a47d54d)
@@ -480,58 +524,6 @@ repositories listed at
524 Running "git fetch" in a repository made with "git clone --single"
525 slurps all the branches, defeating the point of "--single".
526
483 -
484 -* aw/rebase-i-edit-todo (2012-09-19) 5 commits
485 - (merged to 'next' on 2012-09-24 at 95625d7)
486 - + rebase -i: suggest using --edit-todo to fix an unknown instruction
487 - + rebase -i: Add tests for "--edit-todo"
488 - + rebase -i: Teach "--edit-todo" action
489 - + rebase -i: Refactor help messages for todo file
490 - + rebase usage: subcommands can not be combined with -i
491 -
492 - Will merge to 'master'.
493 -
494 -
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
498 - - name-rev --algorithm=weight: cache the computed weight in notes
499 - - name-rev --algorithm=weight: trivial optimization
500 - - name-rev: --algorithm option
501 - - name_rev: clarify the logic to assign a new tip-name to a commit
502 - - name-rev: lose unnecessary typedef
503 -
504 - "git name-rev" names the given revision based on a ref that can be
505 - reached in the smallest number of steps from the rev, but that is
506 - not useful when the caller wants to know which tag is the oldest one
507 - that contains the rev. This teaches a new mode to the command that
508 - uses the oldest ref among those which contain the rev.
509 -
510 - I am not sure if this is worth it; for one thing, even with the help
511 - from notes-cache, it seems to make the "describe --contains" even
512 - slower. Also the command will be unusably slow for a user who does
513 - not have a write access (hence unable to create or update the
514 - notes-cache).
515 -
516 -
517 -* jc/xprm-generation (2012-09-14) 1 commit
518 - - test-generation: compute generation numbers and clock skews
519 -
520 - A toy to analyze how bad the clock skews are in histories of real
521 - world projects.
522 -
523 -
524 -* rs/archive-zip-utf8 (2012-09-24) 4 commits
525 - (merged to 'next' on 2012-09-24 at 9b42b1c)
526 - + archive-zip: write extended timestamp
527 - + archive-zip: support UTF-8 paths
528 - + Revert "archive-zip: support UTF-8 paths"
529 - (merged to 'next' on 2012-09-11 at 3b1f071)
530 - + archive-zip: support UTF-8 paths
531 -
532 - With another reroll, it looks like the series is as polished as it
533 - could be.
534 -
527 Will merge to 'master'.
528
529