From: Junio C Hamano Date: Sun, 4 Apr 2010 18:48:28 +0000 (-0700) Subject: What's cooking (2010/04 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09a7b808b2d10d18a0538a3848f6fa2063d16546;p=thirdparty%2Fgit.git What's cooking (2010/04 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 231ebf74a5..878d8bdb2c 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2010, #01; Fri, 02) -X-master-at: a50dec22f2800fd073aa6ca1d112f25b4f667a56 -X-next-at: 85b6122874e41c12f0cd6ae4744fb1b856d4a0ad +Subject: What's cooking in git.git (Apr 2010, #02; Sun, 04) +X-master-at: 11766ca4a89ba960271e94281463d1b44654ca3b +X-next-at: c303c1b3242eaacf3f3c56ba3a93a3eba1aeb693 -What's cooking in git.git (Apr 2010, #01; Fri, 02) +What's cooking in git.git (Apr 2010, #02; Sun, 04) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,42 +11,130 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -Topics not in 'next' will have to wait until post 1.7.1 cycle. I expect -that the changes still under discussion will be ready by the time the post -1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2 that is -shorter than usual to include them. - -------------------------------------------------- [Graduated to "master"] -* sb/notes-parse-opt (2010-02-27) 1 commit - (merged to 'next' on 2010-03-24 at 82eebc1) - + notes: rework subcommands and parse options - -* cc/cherry-pick-ff (2010-03-20) 7 commits - (merged to 'next' on 2010-03-20 at a1ae16b) - + revert: fix tiny memory leak in cherry-pick --ff - + rebase -i: use new --ff cherry-pick option - (merged to 'next' on 2010-03-07 at 5589b26) - + Documentation: describe new cherry-pick --ff option - + cherry-pick: add tests for new --ff option - + revert: add --ff option to allow fast forward when cherry-picking - + builtin/merge: make checkout_fast_forward() non static - + parse-options: add parse_options_concat() to concat options +* mg/mailmap-update (2010-03-19) 1 commit + (merged to 'next' on 2010-03-28 at 8ac3436) + + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela + +* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit + (merged to 'next' on 2010-03-28 at 7e8e58e) + + send-email: lazily assign editor variable + +* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit + (merged to 'next' on 2010-03-28 at d3e9f04) + + rev-list: use default abbrev length when abbrev-commit is in effect + +* rb/maint-python-path (2010-03-21) 1 commit + (merged to 'next' on 2010-03-28 at 58ba409) + + Correct references to /usr/bin/python which does not exist on FreeBSD + +* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit + (merged to 'next' on 2010-03-28 at fbedd77) + + imap-send: Remove limitation on message body + +* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit + (merged to 'next' on 2010-03-28 at bf02879) + + http-backend: Don't infinite loop during die() + +* bc/t5505-fix (2010-03-19) 3 commits + (merged to 'next' on 2010-03-28 at 1b097af) + + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob + + t5505: add missing && + + t5505: remove unnecessary subshell invocations + +* bw/template-tool-buildconfig (2010-03-20) 2 commits + (merged to 'next' on 2010-03-28 at 1e6fd8d) + + Modernize git calling conventions in hook templates + + Make templates honour SHELL_PATH and PERL_PATH + +* mb/rebase-i-no-ff (2010-03-24) 1 commit + (merged to 'next' on 2010-03-28 at b2c54cb) + + Teach rebase the --no-ff option. + +* jn/merge-diff3-label (2010-03-20) 14 commits + (merged to 'next' on 2010-03-20 at 26f1805) + + merge-recursive: add a label for ancestor + + cherry-pick, revert: add a label for ancestor + + revert: clarify label on conflict hunks + + compat: add mempcpy() + + checkout -m --conflict=diff3: add a label for ancestor + + merge_trees(): add ancestor label parameter for diff3-style output + + merge_file(): add comment explaining behavior wrt conflict style + + checkout --conflict=diff3: add a label for ancestor + + ll_merge(): add ancestor label parameter for diff3-style output + + merge-file --diff3: add a label for ancestor + + xdl_merge(): move file1 and file2 labels to xmparam structure + + xdl_merge(): add optional ancestor label to diff3-style output + + tests: document cherry-pick behavior in face of conflicts + + tests: document format of conflicts from checkout -m + (this branch is used by cc/revert-strategy.) + +* do/rebase-i-arbitrary (2010-03-14) 1 commit + (merged to 'next' on 2010-03-28 at 5ba9970) + + rebase--interactive: don't require what's rebased to be a branch + +* ja/send-email-ehlo (2010-03-14) 3 commits + (merged to 'next' on 2010-03-28 at 00964a8) + + git-send-email.perl - try to give real name of the calling host to HELO/EHLO + + git-send-email.perl: add option --smtp-debug + + git-send-email.perl: improve error message in send_message() + +* ak/everyday-git (2009-10-21) 1 commit + (merged to 'next' on 2010-03-28 at ae67548) + + everyday: fsck and gc are not everyday operations + +* bc/acl-test (2010-03-15) 5 commits + (merged to 'next' on 2010-03-28 at b40fa09) + + t/t1304: make a second colon optional in the mask ACL check + + t/t1304: set the ACL effective rights mask + + t/t1304: use 'test -r' to test readability rather than looking at mode bits + + t/t1304: set the Default ACL base entries + + t/t1304: avoid -d option to setfacl + +* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit + (merged to 'next' on 2010-03-28 at 305ad0b) + + daemon.c: avoid accessing ss_family member of struct sockaddr_storage + +* ef/cherry-abbrev (2010-03-20) 2 commits + (merged to 'next' on 2010-03-28 at eb3825c) + + ls: remove redundant logic + + cherry: support --abbrev option + +* gh/maint-stash-show-error-message (2010-03-16) 1 commit + (merged to 'next' on 2010-03-28 at 61a5643) + + Improve error messages from 'git stash show' + +* rs/threaded-grep-context (2010-03-15) 1 commit + (merged to 'next' on 2010-03-28 at 1934af1) + + grep: enable threading for context line printing -------------------------------------------------- [New Topics] -* cw/ws-indent-with-tab (2010-04-01) 2 commits - - whitespace: we cannot "catch all errors known to git" anymore - - Add tab-in-indent whitespace error class +* mh/status-optionally-refresh (2010-04-03) 3 commits + - t7508: add a test for "git status" in a read-only repository + - git status: refresh the index if possible + - t7508: add test for "git status" refreshing the index -Not quite ready until "apply --whitespace=fix" gets a matching change. +* jn/mailinfo-scissors (2010-04-03) 1 commit + - Teach mailinfo %< as an alternative scissors mark -* ic/bash-completion-rpm (2010-03-26) 1 commit - - RPM spec: include bash completion support +* tr/word-diff (2010-04-04) 2 commits + - gitk: add the equivalent of diff --color-words + - diff: add --word-diff option that generalizes --color-words + +The tip "gitk" one I'd prefer to wait until we get Ack from Paulus. + +-------------------------------------------------- +[Stalled] -This is needed in 'master' by -rc1 at the latest. Soon in 'next'. +* js/rebase-origin-x (2010-02-05) 1 commit + - [RFC w/o test and incomplete] rebase: add -x option to record original commit name + +I retract my objection against the idea of -x; needs polishing before +moving forward. * js/grep-open (2010-03-26) 2 commits - grep -O: allow optional argument specifying the pager (or editor) @@ -54,6 +142,63 @@ This is needed in 'master' by -rc1 at the latest. Soon in 'next'. Probably needs to support --no-index mode as well. +* sd/log-decorate (2010-02-17) 3 commits + (merged to 'next' on 2010-03-08 at 58a6fba) + + log.decorate: usability fixes + + Add `log.decorate' configuration variable. + + git_config_maybe_bool() + +Needs squelching the configuration setting when "--pretty=raw" is given, +at least, or possibly when any "--pretty" is explicitly given. + +* np/malloc-threading (2010-03-24) 1 commit + - Make xmalloc and xrealloc thread-safe + +Still has locking issues? + +* js/async-thread (2010-03-09) 7 commits + - Enable threaded async procedures whenever pthreads is available + (merged to 'next' on 2010-03-20 at 9939243) + + Dying in an async procedure should only exit the thread, not the process. + + Reimplement async procedures using pthreads + + Windows: more pthreads functions + + Fix signature of fcntl() compatibility dummy + + Make report() from usage.c public as vreportf() and use it. + + Modernize t5530-upload-pack-error. + +Waiting for resolution of locking issues in malloc-threading. + +-------------------------------------------------- +[Cooking] + +* sg/bash-completion (2010-02-23) 4 commits + (merged to 'next' on 2010-03-08 at bc59860) + + bash: completion for gitk aliases + + bash: support user-supplied completion scripts for aliases + + bash: support user-supplied completion scripts for user's git commands + + bash: improve aliased command recognition + +Nobody seems to care about "_git_frotz" that may potentially crash with +whatever random things the end users is doing in their environment, and +renaming them to "_git_complete_frotz" to avoid that. So let's not worry +about that. + +* cw/ws-indent-with-tab (2010-04-03) 6 commits + - whitespace: tests for git-apply --whitespace=fix with tab-in-indent + - whitespace: add tab-in-indent support for --whitespace=fix + - whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst + - whitespace: tests for git-diff --check with tab-in-indent error class + - whitespace: add tab-in-indent error class + - whitespace: we cannot "catch all errors known to git" anymore + +Looked sensible. + +* ic/bash-completion-rpm (2010-03-26) 1 commit + (merged to 'next' on 2010-04-02 at 0358304) + + RPM spec: include bash completion support + +This is needed in 'master' by -rc1 at the latest. + * mg/notes-reflog (2010-03-29) 2 commits - refs.c: Write reflogs for notes just like for branch heads - t3301-notes: Test the creation of reflog entries @@ -88,12 +233,11 @@ this with a confidence than fast-tracking it. - merge: refactor code that calls "git merge-STRATEGY" - revert: refactor merge recursive code into its own function - revert: use strbuf to refactor the code that writes the merge message - (this branch uses jn/merge-diff3-label.) May merge to 'next' soon, but this is more about debugging and we are not in a great hurry. -* mr/gitweb-jsmin (2010-04-01) 6 commits +* mr/gitweb-jsmin (2010-04-02) 6 commits - gitweb: update INSTALL to use shorter make target - gitweb: add documentation to INSTALL regarding gitweb.js - instaweb: add minification awareness @@ -101,86 +245,27 @@ in a great hurry. - Gitweb: add support for minifying gitweb.css - Gitweb: add ignore and clean rules for minified files -Soon in 'next' when minor rewording replacement patches come; otherwise -felt solid. +Soon in 'next', to iron out leftover issues if any. * sc/http-late-auth (2010-04-01) 1 commit - - Prompt for a username when an HTTP request 401s + (merged to 'next' on 2010-04-02 at c991acf) + + Prompt for a username when an HTTP request 401s -May merge to 'next', but I would prefer waiting til 1.7.2 to have -this with a confidence than fast-tracking it. - -* hg/convert (2010-03-29) 5 commits - . convert: Added core.refilteronadd feature. - . convert: Inhibit contraction of foreign $Id$ during stats. - . convert: Use the enum constant SAFE_CRLF_FALSE. - . convert: Keep foreign $Id$ on checkout. - . convert: Safer handling of $Id$ contraction. +I would prefer waiting til 1.7.2 to have this with a confidence than +fast-tracking it. * jk/cached-textconv (2010-04-01) 7 commits - - diff: avoid useless filespec population - - diff: cache textconv output - - textconv: refactor calls to run_textconv - - introduce notes-cache interface - - make commit_tree a library function - - fix textconv leak in emit_rewrite_diff - - fix const-correctness of write_sha1_file - -May merge to 'next', but I would prefer waiting til 1.7.2 to have -this with a confidence than fast-tracking it. - --------------------------------------------------- -[Stalled] - -* cw/test-lib-relicense (2010-02-22) 1 commit - . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. - -Ack-collection stopped at the last three names. I am hoping Carl can take -it from there without my keeping an eye on it. - -* js/rebase-origin-x (2010-02-05) 1 commit - - [RFC w/o test and incomplete] rebase: add -x option to record original commit name - -I retract my objection against the idea of -x; needs polishing before -moving forward. - -* sg/bash-completion (2010-02-23) 4 commits - (merged to 'next' on 2010-03-08 at bc59860) - + bash: completion for gitk aliases - + bash: support user-supplied completion scripts for aliases - + bash: support user-supplied completion scripts for user's git commands - + bash: improve aliased command recognition - -Perhaps rename _git_frotz -> _git_complete_frotz? I dunno. - -* sd/log-decorate (2010-02-17) 3 commits - (merged to 'next' on 2010-03-08 at 58a6fba) - + log.decorate: usability fixes - + Add `log.decorate' configuration variable. - + git_config_maybe_bool() - -Needs squelching the configuration setting when "--pretty=raw" is given, -at least, or possibly when any "--pretty" is explicitly given. - -* np/malloc-threading (2010-03-24) 1 commit - - Make xmalloc and xrealloc thread-safe - -Still has locking issues? - -* js/async-thread (2010-03-09) 7 commits - - Enable threaded async procedures whenever pthreads is available - (merged to 'next' on 2010-03-20 at 9939243) - + Dying in an async procedure should only exit the thread, not the process. - + Reimplement async procedures using pthreads - + Windows: more pthreads functions - + Fix signature of fcntl() compatibility dummy - + Make report() from usage.c public as vreportf() and use it. - + Modernize t5530-upload-pack-error. - -Waiting for resolution of locking issues in malloc-threading. - --------------------------------------------------- -[Cooking] + (merged to 'next' on 2010-04-02 at a023e3c) + + diff: avoid useless filespec population + + diff: cache textconv output + + textconv: refactor calls to run_textconv + + introduce notes-cache interface + + make commit_tree a library function + + fix textconv leak in emit_rewrite_diff + + fix const-correctness of write_sha1_file + +I would prefer waiting til 1.7.2 to have this with a confidence than +fast-tracking it. * da/maint-python-startup (2010-03-27) 1 commit (merged to 'next' on 2010-04-01 at ca6897a) @@ -194,7 +279,8 @@ Hopefully will merge to 'master' by -rc0. Hopefully will merge to 'master' by -rc0. -* ld/discovery-limit-to-fs (2010-03-17) 3 commits +* ld/discovery-limit-to-fs (2010-04-04) 4 commits + - GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries - Add support for GIT_ONE_FILESYSTEM - truncate cwd string before printing error message - config.c: remove static keyword from git_env_bool() @@ -202,9 +288,11 @@ Hopefully will merge to 'master' by -rc0. Linus made a good point of making this a default, and Erick Mattos confirmed that it won't be a problem even on Windows. -Will move to 'next' after such a "default on" change, keep it there until -1.7.1 ships, warn about it in the release notes as an upcoming backward -incompatibility, and then move to 'master' after 1.7.1. +The tip one is my attempt to do just that, but I have a feeling that +it is introducing a double-negation. ONE-FILESYSTEM that defaults to +true but the user can flip it to false to trigger NOT-LIMITED-TO-ONE +semantics. Perhaps it should be renamed to GIT_DISCOVER_REPOSITORY_XDEV +or something that defaults to false. * sb/fmt-merge-msg (2010-03-24) 7 commits (merged to 'next' on 2010-04-01 at 5fcbec5) @@ -219,12 +307,13 @@ incompatibility, and then move to 'master' after 1.7.1. Hopefully will merge to 'master' by -rc0. * pc/remove-warn (2010-03-26) 4 commits - - Remove a redundant errno test in a usage of remove_path - - Introduce remove_or_warn function - - Implement the rmdir_or_warn function - - Generalise the unlink_or_warn function + (merged to 'next' on 2010-04-02 at 52fc00d) + + Remove a redundant errno test in a usage of remove_path + + Introduce remove_or_warn function + + Implement the rmdir_or_warn function + + Generalise the unlink_or_warn function -I cherry-picked only obviously sensible bits. Soon in 'next'. +I cherry-picked only obviously sensible bits. * ef/maint-empty-commit-log (2010-03-21) 1 commit (merged to 'next' on 2010-03-28 at aa103e5) @@ -239,42 +328,6 @@ Hopefully will merge to 'master' by -rc0. Perhaps needs a bit of documentation updates, describing the "going open source" scenario. -* mg/mailmap-update (2010-03-19) 1 commit - (merged to 'next' on 2010-03-28 at 8ac3436) - + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela - -Soon in 'master'. - -* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at 7e8e58e) - + send-email: lazily assign editor variable - -Soon in 'master'. - -* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at d3e9f04) - + rev-list: use default abbrev length when abbrev-commit is in effect - -Soon in 'master'. - -* rb/maint-python-path (2010-03-21) 1 commit - (merged to 'next' on 2010-03-28 at 58ba409) - + Correct references to /usr/bin/python which does not exist on FreeBSD - -Soon in 'master'. - -* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at fbedd77) - + imap-send: Remove limitation on message body - -Soon in 'master'. - -* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit - (merged to 'next' on 2010-03-28 at bf02879) - + http-backend: Don't infinite loop during die() - -Soon in 'master'. - * ar/config-from-command-line (2010-03-26) 2 commits - Use strbufs instead of open-coded string manipulation - Allow passing of configuration parameters in the command line @@ -282,102 +335,6 @@ Soon in 'master'. May merge to 'next', but I would prefer waiting til 1.7.2 to have this with a confidence than fast-tracking it. -* bc/t5505-fix (2010-03-19) 3 commits - (merged to 'next' on 2010-03-28 at 1b097af) - + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob - + t5505: add missing && - + t5505: remove unnecessary subshell invocations - -Soon in 'master'. - -* bw/template-tool-buildconfig (2010-03-20) 2 commits - (merged to 'next' on 2010-03-28 at 1e6fd8d) - + Modernize git calling conventions in hook templates - + Make templates honour SHELL_PATH and PERL_PATH - -Soon in 'master'. - -* mb/rebase-i-no-ff (2010-03-24) 1 commit - (merged to 'next' on 2010-03-28 at b2c54cb) - + Teach rebase the --no-ff option. - -Soon in 'master'. - -* jn/merge-diff3-label (2010-03-20) 14 commits - (merged to 'next' on 2010-03-20 at 26f1805) - + merge-recursive: add a label for ancestor - + cherry-pick, revert: add a label for ancestor - + revert: clarify label on conflict hunks - + compat: add mempcpy() - + checkout -m --conflict=diff3: add a label for ancestor - + merge_trees(): add ancestor label parameter for diff3-style output - + merge_file(): add comment explaining behavior wrt conflict style - + checkout --conflict=diff3: add a label for ancestor - + ll_merge(): add ancestor label parameter for diff3-style output - + merge-file --diff3: add a label for ancestor - + xdl_merge(): move file1 and file2 labels to xmparam structure - + xdl_merge(): add optional ancestor label to diff3-style output - + tests: document cherry-pick behavior in face of conflicts - + tests: document format of conflicts from checkout -m - (this branch is used by cc/revert-strategy.) - -Soon in 'master'. - -* do/rebase-i-arbitrary (2010-03-14) 1 commit - (merged to 'next' on 2010-03-28 at 5ba9970) - + rebase--interactive: don't require what's rebased to be a branch - -Soon in 'master'. - -* ja/send-email-ehlo (2010-03-14) 3 commits - (merged to 'next' on 2010-03-28 at 00964a8) - + git-send-email.perl - try to give real name of the calling host to HELO/EHLO - + git-send-email.perl: add option --smtp-debug - + git-send-email.perl: improve error message in send_message() - -Soon in 'master'. - -* ak/everyday-git (2009-10-21) 1 commit - (merged to 'next' on 2010-03-28 at ae67548) - + everyday: fsck and gc are not everyday operations - -Soon in 'master'. - -* bc/acl-test (2010-03-15) 5 commits - (merged to 'next' on 2010-03-28 at b40fa09) - + t/t1304: make a second colon optional in the mask ACL check - + t/t1304: set the ACL effective rights mask - + t/t1304: use 'test -r' to test readability rather than looking at mode bits - + t/t1304: set the Default ACL base entries - + t/t1304: avoid -d option to setfacl - -Soon in 'master'. - -* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit - (merged to 'next' on 2010-03-28 at 305ad0b) - + daemon.c: avoid accessing ss_family member of struct sockaddr_storage - -Soon in 'master'. - -* ef/cherry-abbrev (2010-03-20) 2 commits - (merged to 'next' on 2010-03-28 at eb3825c) - + ls: remove redundant logic - + cherry: support --abbrev option - -Soon in 'master'. - -* gh/maint-stash-show-error-message (2010-03-16) 1 commit - (merged to 'next' on 2010-03-28 at 61a5643) - + Improve error messages from 'git stash show' - -Soon in 'master'. - -* rs/threaded-grep-context (2010-03-15) 1 commit - (merged to 'next' on 2010-03-28 at 1934af1) - + grep: enable threading for context line printing - -Soon in 'master'. - * nd/setup (2010-03-25) 43 commits - builtins: do not commit pager choice early - builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository @@ -422,3 +379,22 @@ Soon in 'master'. - config: use RUN_SETUP_GENTLY - builtin: Support RUN_SETUP_GENTLY to set up repository early if found - builtin: introduce startup_info struct + +-------------------------------------------------- +[Dropped] + +* cw/test-lib-relicense (2010-02-22) 1 commit + . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. + +I am hoping Carl or Michal Sojka can take the topic to completion without +my keeping an eye on it. Waiting for the one with full set of Acks. + +* hg/convert (2010-03-29) 5 commits + . convert: Added core.refilteronadd feature. + . convert: Inhibit contraction of foreign $Id$ during stats. + . convert: Use the enum constant SAFE_CRLF_FALSE. + . convert: Keep foreign $Id$ on checkout. + . convert: Safer handling of $Id$ contraction. + +The first two looked sensible but later one looked more like showing that +it may not have been a good idea in the first place.