diff --git a/whats-cooking.txt b/whats-cooking.txt index 93ec10f90c..15f00270de 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, #01; Mon, 04) -X-master-at: bd757c18597789d4f01cbd2ffc7c1f55e90cfcd0 -X-next-at: 8802c2c062c167ec9c81e811dd90791ed3fdc74b +Subject: What's cooking in git.git (Jan 2010, #02; Thu, 07) +X-master-at: d6f8fd0b3eeb4349493209740742d67616e0263c +X-next-at: 5229608cd809769104adde442690de7ca1b6b5db -What's cooking in git.git (Jan 2010, #01; Mon, 04) +What's cooking in git.git (Jan 2010, #02; Thu, 07) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -13,12 +13,126 @@ 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' + -------------------------------------------------- [New Topics] +* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit + - checkout -m path: fix recreating conflicts + +* 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 + +-------------------------------------------------- +[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-02 at 5499bbe) + + grep: do not do external grep on skip-worktree entries + + commit: correctly respect skip-worktree bit + + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID + + tests: rename duplicate t1009 + + sparse checkout: inhibit empty worktree + + Add tests for sparse checkout + + read-tree: add --no-sparse-checkout to disable sparse checkout support + + unpack-trees(): ignore worktree check outside checkout area + + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index + + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout + + unpack-trees.c: generalize verify_* functions + + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone + + Introduce "sparse checkout" + + dir.c: export excluded_1() and add_excludes_from_file_1() + + excluded_1(): support exclude files in index + + unpack-trees(): carry skip-worktree bit over in merged_entry() + + Read .gitignore from index if it is skip-worktree + + Avoid writing to buffer in add_excludes_from_file_1() + + Teach Git to respect skip-worktree bit (writing part) + + Teach Git to respect skip-worktree bit (reading part) + + Introduce "skip-worktree" bit in index, teach Git to get/set this bit + + 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 + +* 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 + +-------------------------------------------------- +[Cooking] + * da/difftool (2009-12-22) 2 commits - - git-difftool: Add '--gui' for selecting a GUI tool - - t7800-difftool: Set a bogus tool for use by tests + (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 * jh/gitweb-cached (2010-01-03) 4 commits - gitweb: Makefile improvements @@ -26,8 +140,11 @@ 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. + * tc/test-locate-httpd (2010-01-02) 1 commit - - t/lib-http.sh: Restructure finding of default httpd location + (merged to 'next' on 2010-01-06 at 9d913e5) + + t/lib-http.sh: Restructure finding of default httpd location * jc/fix-tree-walk (2009-09-14) 7 commits - read-tree --debug-unpack @@ -38,12 +155,14 @@ The tip of 'next' has been rebuilt on top of the current 'master'. - more D/F conflict tests - tests: move convenience regexp to match object names to test-lib.sh -Resurrected from "Ejected" category. +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. --------------------------------------------------- -[Cooking] - -* cc/reset-more (2010-01-04) 6 commits +* 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) @@ -53,69 +172,47 @@ Resurrected from "Ejected" category. + Documentation: reset: add some tables to describe the different options + reset: improve mixed reset error message when in a bare repo -* 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 - * 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. + * jc/rerere (2009-12-04) 1 commit - Teach --[no-]rerere-autoupdate option to merge, revert and friends -* 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 - * jk/run-command-use-shell (2010-01-01) 8 commits - t4030, t4031: work around bogus MSYS bash path conversion - - t0021: use $SHELL_PATH for the filter script - 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 - Xref: news.gmane.org gmane.comp.version-control.git:136128 - * check t0021: drop one to t4030; - * reorder and move t0021 up, immediately after run-command: optimize - -* 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 +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 -* 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. - * 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 -* tc/smart-http-restrict (2010-01-02) 4 commits - - Smart-http tests: Test http-backend without curl or a webserver - - Smart-http tests: Break test t5560-http-backend into pieces - - Smart-http tests: Improve coverage in test t5560 - - Smart-http: check if repository is OK to export before serving it +Perhaps needs an entry in the Release Notes, but otherwise looked Ok. -* 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 +* tc/smart-http-restrict (2010-01-02) 4 commits + (merged to 'next' on 2010-01-06 at 82736cb) + + Smart-http tests: Test http-backend without curl or a webserver + + Smart-http tests: Break test t5560-http-backend into pieces + + Smart-http tests: Improve coverage in test t5560 + + Smart-http: check if repository is OK to export before serving it * jc/cache-unmerge (2009-12-25) 9 commits - rerere forget path: forget recorded resolution @@ -128,24 +225,17 @@ Resurrected from "Ejected" category. - resolve-undo: record resolved conflicts in a new index extension section - builtin-merge.c: use standard active_cache macros -* 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' - -* 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 +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 -* jc/checkout-merge-base (2009-11-20) 2 commits +Needs tests. + +* jc/checkout-merge-base (2010-01-07) 4 commits + (merged to 'next' on 2010-01-07 at 5229608) + + rebase -i: teach --onto A...B syntax + + rebase: fix --onto A...B parsing and add tests (merged to 'next' on 2010-01-02 at 6a8f6fc) + "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 @@ -158,29 +248,28 @@ Resurrected from "Ejected" category. - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs - t5541-http-push.sh: add tests for non-fast-forward pushes -* 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 +Peff: $gmane/136169, 136167, 136168 +RC: $gmane/136172 * il/vcs-helper (2009-12-09) 8 commits - - 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 + (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 - - Detailed diagnosis when parsing an object name fails. + (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 - - Add a command "fixup" to rebase --interactive - - t3404: Use test_commit to set up test repository + (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 @@ -189,9 +278,9 @@ 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) 2 commits - - fixup! rebase -i --autosquash - - rebase -i --autosquash: auto-squash commits +* 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 @@ -208,13 +297,18 @@ improvement to skip opening the editor if a pick is followed only by + Rename t9301 to t9350, to make room for more fast-import tests + fast-import: Proper notes tree manipulation -* fc/opt-quiet-gc-reset (2009-12-02) 1 commit - - General --quiet improvements +http://thread.gmane.org/gmane.comp.version-control.git/134738 -* 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 +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 * sr/gfi-options (2009-12-04) 7 commits - fast-import: add (non-)relative-marks feature @@ -225,6 +319,12 @@ improvement to skip opening the editor if a pick is followed only by - 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. @@ -235,42 +335,3 @@ improvement to skip opening the editor if a pick is followed only by "git pull" patch needs sq-then-eval fix to protect it from $IFS but otherwise seemed good. - -* 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 - -* 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 (2009-12-30) 23 commits - (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 - + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID - + tests: rename duplicate t1009 - + sparse checkout: inhibit empty worktree - + Add tests for sparse checkout - + read-tree: add --no-sparse-checkout to disable sparse checkout support - + unpack-trees(): ignore worktree check outside checkout area - + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index - + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout - + unpack-trees.c: generalize verify_* functions - + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone - + Introduce "sparse checkout" - + dir.c: export excluded_1() and add_excludes_from_file_1() - + excluded_1(): support exclude files in index - + unpack-trees(): carry skip-worktree bit over in merged_entry() - + Read .gitignore from index if it is skip-worktree - + Avoid writing to buffer in add_excludes_from_file_1() - + Teach Git to respect skip-worktree bit (writing part) - + Teach Git to respect skip-worktree bit (reading part) - + Introduce "skip-worktree" bit in index, teach Git to get/set this bit - + Add test-index-version - + update-index: refactor mark_valid() in preparation for new options