From: Junio C Hamano Date: Sun, 10 Jan 2010 19:20:07 +0000 (-0800) Subject: What's cooking (2010/01 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9746c7ce587895794bfb2c6aea5119c3f11422a;p=thirdparty%2Fgit.git What's cooking (2010/01 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt 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