What's cooking (2010/01 #03)

index 15f00270de..471c8f6486 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 (Jan 2010, #02; Thu, 07) -X-master-at: d6f8fd0b3eeb4349493209740742d67616e0263c -X-next-at: 5229608cd809769104adde442690de7ca1b6b5db +Subject: What's cooking in git.git (Jan 2010, #03; Sun, 10) +X-master-at: 637afcf4e07616d1dd15d33f56c6b72f90f39821 +X-next-at: e295b7f76150bd2ee9a82c569ccbbde6b8fba391 -What's cooking in git.git (Jan 2010, #02; Thu, 07) +What's cooking in git.git (Jan 2010, #03; Sun, 10) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,72 +11,139 @@ 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. -The tip of 'next' has been rebuilt on top of the current 'master'. - -------------------------------------------------- [Graduated to "master"] -* mo/bin-wrappers (2009-12-02) 3 commits - (merged to 'next' on 2010-01-03 at 8c5fa27) - + INSTALL: document a simpler way to run uninstalled builds - + run test suite without dashed git-commands in PATH - + build dashless "bin-wrappers" directory similar to installed bindir - -* mv/commit-date (2009-12-03) 2 commits - (merged to 'next' on 2010-01-03 at 1c45fdf) - + Document date formats accepted by parse_date() - + builtin-commit: add --date option - -* bg/maint-add-all-doc (2009-12-07) 4 commits - (merged to 'next' on 2010-01-03 at b19a323) - + squash! rm documentation--also mention add-u where we mention commit-a - + git-rm doc: Describe how to sync index & work tree - + git-add/rm doc: Consistently back-quote - + Documentation: 'git add -A' can remove files - -* so/cvsserver-update (2009-12-07) 1 commit - (merged to 'next' on 2010-01-03 at 99959b6) - + cvsserver: make the output of 'update' more compatible with cvs. - -* mg/tag-d-show (2009-12-10) 1 commit - (merged to 'next' on 2010-01-03 at 87657d2) - + tag -d: print sha1 of deleted tag - -* sb/maint-octopus (2009-12-11) 3 commits - (merged to 'next' on 2010-01-03 at ffe77d6) - + octopus: remove dead code - + octopus: reenable fast-forward merges - + octopus: make merge process simpler to follow - -* js/filter-branch-prime (2009-12-15) 1 commit - (merged to 'next' on 2010-01-03 at 7c90319) - + filter-branch: remove an unnecessary use of 'git read-tree' +* tr/http-updates (2009-12-28) 4 commits + (merged to 'next' on 2010-01-02 at cf25698) + + Remove http.authAny + + Allow curl to rewind the RPC read buffer + + Add an option for using any HTTP authentication scheme, not only basic + + http: maintain curl sessions + +* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit + (merged to 'next' on 2010-01-02 at 190d63b) + + reset: unbreak hard resets with GIT_WORK_TREE + +* jk/push-to-delete (2009-12-30) 1 commit + (merged to 'next' on 2010-01-03 at 9ee293b) + + builtin-push: add --delete as syntactic sugar for :foo + +* mm/config-path (2009-12-30) 1 commit + (merged to 'next' on 2010-01-03 at 9c0e81a) + + builtin-config: add --path option doing ~ and ~user expansion. + +* pm/cvs-environ (2009-12-30) 1 commit + (merged to 'next' on 2010-01-03 at 4c22932) + + CVS Server: Support reading base and roots from environment + +* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit + (merged to 'next' on 2010-01-03 at b785974) + + bash completion: factor submodules into dirty state + +* bg/maint-remote-update-default (2009-12-31) 1 commit + (merged to 'next' on 2010-01-03 at 113009e) + + Fix "git remote update" with remotes.defalt set + +* mm/diag-path-in-treeish (2009-12-07) 1 commit + (merged to 'next' on 2010-01-06 at 6b4201e) + + Detailed diagnosis when parsing an object name fails. + +* fc/opt-quiet-gc-reset (2009-12-02) 1 commit + (merged to 'next' on 2010-01-06 at 03e00cd) + + General --quiet improvements -------------------------------------------------- [New Topics] -* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit - - checkout -m path: fix recreating conflicts +* bk/fix-relative-gitdir-file (2010-01-08) 2 commits + - Handle relative paths in submodule .git files + - Test update-index for a gitlink to a .git file + +* jc/ident (2010-01-08) 3 commits + - ident.c: treat $EMAIL as giving user.email identity explicitly + (merged to 'next' on 2010-01-10 at f1f9ded) + + ident.c: check explicit identity for name and email separately + + ident.c: remove unused variables + +* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits + - ls-files: fix overeager pathspec optimization + - read_directory(): further split treat_path() + - read_directory_recursive(): refactor handling of a single path into a separate function + - t3001: test ls-files -o ignored/dir + +* js/exec-error-report (2010-01-10) 4 commits + - Improve error message when a transport helper was not found + - start_command: detect execvp failures early + - run-command: move wait_or_whine earlier + - start_command: report child process setup errors to the parent's stderr + (this branch uses il/vcs-helper.) -* jn/makefile (2010-01-06) 4 commits - - Makefile: consolidate .FORCE-* targets - - Makefile: learn to generate listings for targets requiring special flags - - Makefile: use target-specific variable to pass flags to cc - - Makefile: regenerate assembler listings when asked +-------------------------------------------------- +[Stalled] + +* ap/merge-backend-opts (2008-07-18) 6 commits + - Document that merge strategies can now take their own options + - Extend merge-subtree tests to test -Xsubtree=dir. + - Make "subtree" part more orthogonal to the rest of merge-recursive. + - Teach git-pull to pass -X<option> to git-merge + - git merge -X<option> + - git-merge-file --ours, --theirs + +"git pull" patch needs sq-then-eval fix to protect it from $IFS +but otherwise seemed good. + +* jh/commit-status (2009-12-07) 1 commit + - [test?] Add commit.status, --status, and --no-status + +Needs tests. + +* mh/rebase-fixup (2009-12-07) 2 commits + (merged to 'next' on 2010-01-06 at c4779a7) + + Add a command "fixup" to rebase --interactive + + t3404: Use test_commit to set up test repository + (this branch is used by ns/rebase-auto-squash.) + +Expecting further improvements to skip opening the editor if a pick is +followed only by "fixup" and no "squash". + +* ns/rebase-auto-squash (2009-12-08) 1 commit + (merged to 'next' on 2010-01-06 at da4e2f5) + + rebase -i --autosquash: auto-squash commits + (this branch uses mh/rebase-fixup.) + +Blocked by the above. + +* jh/notes (2009-12-07) 11 commits + - Refactor notes concatenation into a flexible interface for combining notes + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree + - Notes API: for_each_note(): Traverse the entire notes tree with a callback + - Notes API: get_note(): Return the note annotating the given object + - Notes API: add_note(): Add note objects to the internal notes tree structure + - Notes API: init_notes(): Initialize the notes tree from the given notes ref + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction + - Minor style fixes to notes.c + (merged to 'next' on 2010-01-02 at ae42130) + + Add more testcases to test fast-import of notes + + Rename t9301 to t9350, to make room for more fast-import tests + + fast-import: Proper notes tree manipulation + +http://thread.gmane.org/gmane.comp.version-control.git/134738 + +What's the status of the fourth and later patches on this topic? Overall +it looked reasonable, if I recall correctly what I thought when I reviewed +it last time, and I am tempted to merge it to 'next' soonish. Please +file complaints before I do so if people have objections. + +Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183 -------------------------------------------------- [Will graduate after a bit more cooking] -* tr/http-updates (2009-12-28) 4 commits - (merged to 'next' on 2010-01-02 at cf25698) - + Remove http.authAny - + Allow curl to rewind the RPC read buffer - + Add an option for using any HTTP authentication scheme, not only basic - + http: maintain curl sessions - * nd/sparse (2010-01-04) 25 commits - - t7002: test for not using external grep on skip-worktree paths - - t7002: set test prerequisite "external-grep" if supported + (merged to 'next' on 2010-01-10 at fa73d6e) + + t7002: test for not using external grep on skip-worktree paths + + t7002: set test prerequisite "external-grep" if supported (merged to 'next' on 2010-01-02 at 5499bbe) + grep: do not do external grep on skip-worktree entries + commit: correctly respect skip-worktree bit @@ -102,34 +169,62 @@ The tip of 'next' has been rebuilt on top of the current 'master'. + Add test-index-version + update-index: refactor mark_valid() in preparation for new options -* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit - (merged to 'next' on 2010-01-02 at 190d63b) - + reset: unbreak hard resets with GIT_WORK_TREE +I've queued the (close to) original tests for external grep, but as a belt +and suspender measure Nguyễn may also want to add the whitebox test +in the review thread. -* jk/push-to-delete (2009-12-30) 1 commit - (merged to 'next' on 2010-01-03 at 9ee293b) - + builtin-push: add --delete as syntactic sugar for :foo - -* mm/config-path (2009-12-30) 1 commit - (merged to 'next' on 2010-01-03 at 9c0e81a) - + builtin-config: add --path option doing ~ and ~user expansion. - -* pm/cvs-environ (2009-12-30) 1 commit - (merged to 'next' on 2010-01-03 at 4c22932) - + CVS Server: Support reading base and roots from environment +* cc/reset-more (2010-01-08) 8 commits + (merged to 'next' on 2010-01-10 at 84730de) + + t7111: check that reset options work as described in the tables + (merged to 'next' on 2010-01-06 at 96639cb) + + Documentation: reset: add some missing tables + (merged to 'next' on 2010-01-04 at 8802c2c) + + Fix bit assignment for CE_CONFLICTED + (merged to 'next' on 2010-01-03 at f83d4c6) + + "reset --merge": fix unmerged case + + reset: use "unpack_trees()" directly instead of "git read-tree" + + reset: add a few tests for "git reset --merge" + + Documentation: reset: add some tables to describe the different options + + reset: improve mixed reset error message when in a bare repo -* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit - (merged to 'next' on 2010-01-03 at b785974) - + bash completion: factor submodules into dirty state +* rs/maint-archive-match-pathspec (2009-12-12) 1 commit + (merged to 'next' on 2010-01-03 at 92d7d15) + + archive: complain about path specs that don't match anything -* bg/maint-remote-update-default (2009-12-31) 1 commit - (merged to 'next' on 2010-01-03 at 113009e) - + Fix "git remote update" with remotes.defalt set +* il/vcs-helper (2010-01-09) 9 commits + (merged to 'next' on 2010-01-10 at 11e448e) + + Reset possible helper before reusing remote structure + (merged to 'next' on 2010-01-06 at 7c79f42) + + Remove special casing of http, https and ftp + + Support remote archive from all smart transports + + Support remote helpers implementing smart transports + + Support taking over transports + + Refactor git transport options parsing + + Pass unknown protocols to external protocol handlers + + Support mandatory capabilities + + Add remote helper debug mode + (this branch is used by js/exec-error-report.) -------------------------------------------------- [Cooking] -* da/difftool (2009-12-22) 2 commits +* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit + (merged to 'next' on 2010-01-10 at df14116) + + checkout -m path: fix recreating conflicts + +* jn/makefile (2010-01-06) 4 commits + (merged to 'next' on 2010-01-10 at f5a5d42) + + Makefile: consolidate .FORCE-* targets + + Makefile: learn to generate listings for targets requiring special flags + + Makefile: use target-specific variable to pass flags to cc + + Makefile: regenerate assembler listings when asked + +* da/difftool (2010-01-09) 6 commits + (merged to 'next' on 2010-01-10 at 749c870) + + git-diff.txt: Link to git-difftool + + difftool: Allow specifying unconfigured commands with --extcmd + + difftool--helper: Remove use of the GIT_MERGE_TOOL variable + + difftool--helper: Update copyright and remove distracting comments (merged to 'next' on 2010-01-06 at e957395) + git-difftool: Add '--gui' for selecting a GUI tool + t7800-difftool: Set a bogus tool for use by tests @@ -140,7 +235,7 @@ The tip of 'next' has been rebuilt on top of the current 'master'. - gitweb: Add option to force version match - gitweb: Load checking -Will merge to 'next', unless I hear objections within a few days. +Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306 * tc/test-locate-httpd (2010-01-02) 1 commit (merged to 'next' on 2010-01-06 at 9d913e5) @@ -157,53 +252,36 @@ Will merge to 'next', unless I hear objections within a few days. Resurrected from "Ejected" category. This is fix for a tricky codepath and testing and improving before it hits 'next' by brave souls is greatly -appreciated. I am not very happy about the solution myself. - -* cc/reset-more (2010-01-08) 8 commits - - t7111: check that reset options work as described in the tables - (merged to 'next' on 2010-01-06 at 96639cb) - + Documentation: reset: add some missing tables - (merged to 'next' on 2010-01-04 at 8802c2c) - + Fix bit assignment for CE_CONFLICTED - (merged to 'next' on 2010-01-03 at f83d4c6) - + "reset --merge": fix unmerged case - + reset: use "unpack_trees()" directly instead of "git read-tree" - + reset: add a few tests for "git reset --merge" - + Documentation: reset: add some tables to describe the different options - + reset: improve mixed reset error message when in a bare repo +appreciated (I am using this in my private build). * jc/branch-d (2009-12-29) 1 commit - - branch -d: base the "already-merged" safety on the branch it merges with - -http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863 -I am tempted to merge this to 'next', but please stop me if people see issues -in it. + (merged to 'next' on 2010-01-10 at 61a14b7) + + branch -d: base the "already-merged" safety on the branch it merges with * jc/rerere (2009-12-04) 1 commit - - Teach --[no-]rerere-autoupdate option to merge, revert and friends + (merged to 'next' on 2010-01-10 at e295b7f) + + Teach --[no-]rerere-autoupdate option to merge, revert and friends * jk/run-command-use-shell (2010-01-01) 8 commits - - t4030, t4031: work around bogus MSYS bash path conversion - - diff: run external diff helper with shell - - textconv: use shell to run helper - - editor: use run_command's shell feature - - run-command: optimize out useless shell calls - - run-command: convert simple callsites to use_shell - - t0021: use $SHELL_PATH for the filter script - - run-command: add "use shell" option + (merged to 'next' on 2010-01-10 at 7479e2a) + + t4030, t4031: work around bogus MSYS bash path conversion + + diff: run external diff helper with shell + + textconv: use shell to run helper + + editor: use run_command's shell feature + + run-command: optimize out useless shell calls + + run-command: convert simple callsites to use_shell + + t0021: use $SHELL_PATH for the filter script + + run-command: add "use shell" option Shuffled the commits in the topic, following J6t's suggestion in http://thread.gmane.org/gmane.comp.version-control.git/136128 -* rs/maint-archive-match-pathspec (2009-12-12) 1 commit - (merged to 'next' on 2010-01-03 at 92d7d15) - + archive: complain about path specs that don't match anything - * tc/clone-v-progress (2009-12-26) 4 commits - - clone: use --progress to force progress reporting - - clone: set transport->verbose when -v/--verbose is used - - git-clone.txt: reword description of progress behaviour - - check stderr with isatty() instead of stdout when deciding to show progress + (merged to 'next' on 2010-01-10 at ec2bfd7) + + clone: use --progress to force progress reporting + + clone: set transport->verbose when -v/--verbose is used + + git-clone.txt: reword description of progress behaviour + + check stderr with isatty() instead of stdout when deciding to show progress Perhaps needs an entry in the Release Notes, but otherwise looked Ok. @@ -225,12 +303,8 @@ Perhaps needs an entry in the Release Notes, but otherwise looked Ok. - resolve-undo: record resolved conflicts in a new index extension section - builtin-merge.c: use standard active_cache macros -Will wait a bit more before moving it to 'next'. - -* jh/commit-status (2009-12-07) 1 commit - - [test?] Add commit.status, --status, and --no-status - -Needs tests. +Will wait a bit more before moving it to 'next'. J6t spotted an issue +with "rerere forget" and has a test script. * jc/checkout-merge-base (2010-01-07) 4 commits (merged to 'next' on 2010-01-07 at 5229608) @@ -240,7 +314,7 @@ Needs tests. + "rebase --onto A...B" replays history on the merge base between A and B + "checkout A...B" switches to the merge base between A and B -* tr/http-push-ref-status (2009-12-24) 6 commits +* tr/http-push-ref-status (2010-01-08) 6 commits - transport-helper.c::push_refs(): emit "no refs" error message - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed - transport.c::transport_push(): make ref status affect return value @@ -248,90 +322,14 @@ Needs tests. - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs - t5541-http-push.sh: add tests for non-fast-forward pushes -Peff: $gmane/136169, 136167, 136168 -RC: $gmane/136172 - -* il/vcs-helper (2009-12-09) 8 commits - (merged to 'next' on 2010-01-06 at 7c79f42) - + Remove special casing of http, https and ftp - + Support remote archive from all smart transports - + Support remote helpers implementing smart transports - + Support taking over transports - + Refactor git transport options parsing - + Pass unknown protocols to external protocol handlers - + Support mandatory capabilities - + Add remote helper debug mode - -* mm/diag-path-in-treeish (2009-12-07) 1 commit - (merged to 'next' on 2010-01-06 at 6b4201e) - + Detailed diagnosis when parsing an object name fails. - -* mh/rebase-fixup (2009-12-07) 2 commits - (merged to 'next' on 2010-01-06 at c4779a7) - + Add a command "fixup" to rebase --interactive - + t3404: Use test_commit to set up test repository - (this branch is used by ns/rebase-auto-squash.) - -Initial round of "fixup" action that is similar to "squash" action in -"rebase -i" that excludes the commit log message from follow-up commits -when composing the log message for the updated one. Expected is a further -improvement to skip opening the editor if a pick is followed only by -"fixup" and no "squash". - -* ns/rebase-auto-squash (2009-12-08) 1 commit - (merged to 'next' on 2010-01-06 at da4e2f5) - + rebase -i --autosquash: auto-squash commits - (this branch uses mh/rebase-fixup.) - -* jh/notes (2009-12-07) 11 commits - - Refactor notes concatenation into a flexible interface for combining notes - - Notes API: Allow multiple concurrent notes trees with new struct notes_tree - - Notes API: for_each_note(): Traverse the entire notes tree with a callback - - Notes API: get_note(): Return the note annotating the given object - - Notes API: add_note(): Add note objects to the internal notes tree structure - - Notes API: init_notes(): Initialize the notes tree from the given notes ref - - Notes API: get_commit_notes() -> format_note() + remove the commit restriction - - Minor style fixes to notes.c - (merged to 'next' on 2010-01-02 at ae42130) - + Add more testcases to test fast-import of notes - + Rename t9301 to t9350, to make room for more fast-import tests - + fast-import: Proper notes tree manipulation - -http://thread.gmane.org/gmane.comp.version-control.git/134738 - -What's the status of the fourth and later patches on this topic? Overall -it looked reasonable, if I recall correctly what I thought when I reviewed -it last time, and I am tempted to merge it to 'next' soonish. Please -file complaints before I do so if people have objections. - -http://mid.gmane.org/201001051231.43048.johan@herland.net Hold! - -* fc/opt-quiet-gc-reset (2009-12-02) 1 commit - (merged to 'next' on 2010-01-06 at 03e00cd) - + General --quiet improvements +Rerolled. * sr/gfi-options (2009-12-04) 7 commits - - fast-import: add (non-)relative-marks feature - - fast-import: allow for multiple --import-marks= arguments - - fast-import: test the new option command - - fast-import: add option command - - fast-import: add feature command - - fast-import: put marks reading in its own function - - fast-import: put option parsing code in separate functions - -http://thread.gmane.org/gmane.comp.version-control.git/134540 - -I haven't seen comments on this round, and I am tempted to merge it to -'next' soonish. Please file complaints before I do so if people have -objections. - -* ap/merge-backend-opts (2008-07-18) 6 commits - - Document that merge strategies can now take their own options - - Extend merge-subtree tests to test -Xsubtree=dir. - - Make "subtree" part more orthogonal to the rest of merge-recursive. - - Teach git-pull to pass -X<option> to git-merge - - git merge -X<option> - - git-merge-file --ours, --theirs - -"git pull" patch needs sq-then-eval fix to protect it from $IFS -but otherwise seemed good. + (merged to 'next' on 2010-01-10 at 8b305fb) + + fast-import: add (non-)relative-marks feature + + fast-import: allow for multiple --import-marks= arguments + + fast-import: test the new option command + + fast-import: add option command + + fast-import: add feature command + + fast-import: put marks reading in its own function + + fast-import: put option parsing code in separate functions