What's cooking (2009/01 #01)

index 63b7ab99cb..75f23dd4e5 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 (Dec 2008, #04; Mon, 29) -X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf -X-next-at: 6f67462436796045e0656107418221a6696bd5f2 +Subject: What's cooking in git.git (Jan 2009, #01; Mon, 05) +X-master-at: e9b852310ebc271bdd71bb3b980e77325ad7f75f +X-next-at: 866a4abd3e8fee98a6d3bc74510db28c4bca0c48 -What's cooking in git.git (Dec 2008, #04; Mon, 29) +What's cooking in git.git (Jan 2009, #01; Mon, 05) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -14,33 +14,73 @@ but I am still holding onto them. The topics list the commits in reverse chronological order. The topics meant to be merged to the maintenance series have "maint-" in their names. +Sorry to have been lagging a bit. There are a few patches I am interested +in but haven't studied yet nor mentioned here. I've been swamped outside +git lately for the past few days, but hopefully I can get to them shortly. + ---------------------------------------------------------------- [New Topics] -* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits - - grep: grep cache entries if they are "assume unchanged" - - grep: support --no-ext-grep to test builtin grep +* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit + + bundle: allow rev-list options to exclude annotated tags -* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit - + diff: add option to show context between close hunks +* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit + + git add: do not add files from a submodule -* as/maint-shortlog-cleanup (Wed Dec 24 17:34:44 2008 +0100) 2 commits - - builtin-shortlog.c: do not unnecessarily strdup before insertion - in list - - builtin-shortlog.c: use string_list_append() instead of - duplicating its code +* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit + + Git.pm: correctly handle directory name that evaluates to "false" -* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit - + merge-recursive: mark rename/delete conflict as unmerged +* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit + + configure clobbers LDFLAGS -* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit - + http-push: support full URI in handle_remote_ls_ctx() +* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits + + cvsserver: change generation of CVS author names + + cvsserver: add option to configure commit message -* jc/maint-ls-tree (Thu Dec 25 16:54:23 2008 -0800) 1 commit - + ls-tree: add --full-tree option +* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit + + bisect view: call gitk if Cygwin's SESSIONNAME variable is set -* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit - + doc/git-send-email: mention sendemail.cc config variable +* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit + + objects to be pruned immediately don't have to be loosened + +* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits + + unpack-trees: remove redundant path search in verify_absent + + unpack-trees: fix path search bug in verify_absent + + unpack-trees: handle failure in verify_absent + +* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit + + git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on + OS X + +All of the above are good fixes and clean-ups; will be fast-tracked to +'master' and maintenance branches as appropriate. + +* mv/apply-parse-opt (Sun Dec 28 00:03:57 2008 +0100) 1 commit + + parse-opt: migrate builtin-apply. + +* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits + + Documentation: clarify which parameters are optional to git-cherry + + git-cherry: make <upstream> parameter optional + +* rs/maint-shortlog-foldline (Mon Dec 29 23:15:50 2008 +0100) 1 commit + - [Need tidying up the log] pretty: support multiline subjects with + format: + +* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits + - rebase: update documentation for --root + - rebase -i: learn to rebase root commit + - rebase: learn to rebase root commit + - rebase -i: execute hook only after argument checking + +I should be able to find time to read this over again and merge to +'next' sometime this week. + +* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit + + git.c: make autocorrected aliases work + +* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit + - [WIP] Add a commit.signoff configuration option to always use -- + signoff in commit ---------------------------------------------------------------- [Stalled and may need help and prodding to go forward] @@ -50,9 +90,7 @@ meant to be merged to the maintenance series have "maint-" in their names. . Add / command in add --patch . git-add -i/-p: Change prompt separater from slash to comma -I am still holding onto this earlier topic to add '/' subcommand to allow -finding a hunk with given text, but I'd rather not merge/rebase it on top -of wp/add-p-goto series myself. Waiting for a reroll. +Will discard and wait for a resubmit. * kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit . git-am: Pass the --directory option through to git-apply @@ -67,7 +105,9 @@ it is up to intrested volunteers to carry it forward. This automatically enables threaded delta search code when autoconf detects pthreads are usable. I haven't heard neither positive nor -negative comments from minority platforms that might be harmed. +negative comments from minority platforms that might be harmed, but +this feels like the right thing to do, so perhaps the best course of +action is to merge this down to 'master' and see if anybody screams. * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits + blame: show "previous" information in --porcelain/--incremental @@ -83,18 +123,17 @@ need to be resurrected before this can move forward. ---------------------------------------------------------------- [Actively cooking] -* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit - - gitweb: unify boolean feature subroutines +* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits + + grep: grep cache entries if they are "assume unchanged" + + grep: support --no-ext-grep to test builtin grep -* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits - + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge- - recursive-fix - + merge-recursive: do not clobber untracked working tree garbage - + modify/delete conflict resolution overwrites untracked file +* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit + + builtin-shortlog.c: use string_list_append(), and don't strdup + unnecessarily -* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits - + merge-recursive: do not clobber untracked working tree garbage - + modify/delete conflict resolution overwrites untracked file +* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits + + Document git-ls-tree --full-tree + + ls-tree: add --full-tree option * js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits - Add an expensive test for git-notes @@ -102,23 +141,6 @@ need to be resurrected before this can move forward. - Add a script to edit/inspect notes - Introduce commit notes -* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits - + Add 'g' command to go to a hunk - + Add subroutine to display one-line summary of hunks - -* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits - - gitweb: cache $parent_commit info in git_blame() - - gitweb: A bit of code cleanup in git_blame() - - gitweb: Move 'lineno' id from link to row element in git_blame - -Jakub seemed to feel they are not yet ready. - -* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit - + Add support for a pdf version of the user manual - -I do not have a new enough combination of dblatex and asciidoc myself but -this may help interested people. - * sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits - gitweb: Optional grouping of projects by category - gitweb: Split git_project_list_body in two functions @@ -133,33 +155,51 @@ this may help interested people. ---------------------------------------------------------------- [Graduated to "master"] -* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits - + rebase -i -p: Fix --continue after a merge could not be redone - + Show a failure of rebase -p if the merge had a conflict - -* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits - + Force t5302 to use a single thread - + pack-objects: don't use too many threads with few objects - + autodetect number of CPUs by default when using threads - -* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits - + Document "git-reset --merge" - + Add 'merge' mode to 'git reset' - ----------------------------------------------------------------- -[Will merge to "master" soon] - * cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits + mergetool: Don't keep temporary merge files unless told to + mergetool: Add prompt to continue after failing to merge a file + Add -y/--no-prompt option to mergetool + Fix some tab/space inconsistencies in git-mergetool.sh -I have been waiting for comments from the original author and other -interested parties, but haven't heard anything yet. This tool is on the -fringe from my point of view anyway, so I'll push them out to 'master' -soon. If there is a breakage that annoys real people, we will hear from -them, and we can take it from there. +---------------------------------------------------------------- +[Will merge to "master" soon] + +* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit + + doc/git-send-email: mention sendemail.cc config variable + +* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit + + diff: add option to show context between close hunks + +* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit + + merge-recursive: mark rename/delete conflict as unmerged + +* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit + + gitweb: unify boolean feature subroutines + +* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits + + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge- + recursive-fix + + merge-recursive: do not clobber untracked working tree garbage + + modify/delete conflict resolution overwrites untracked file + +* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits + + merge-recursive: do not clobber untracked working tree garbage + + modify/delete conflict resolution overwrites untracked file + +* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits + + Add 'g' command to go to a hunk + + Add subroutine to display one-line summary of hunks + +* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits + + gitweb: cache $parent_commit info in git_blame() + + gitweb: A bit of code cleanup in git_blame() + + gitweb: Move 'lineno' id from link to row element in git_blame + +* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit + + Add support for a pdf version of the user manual + +* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit + + http-push: support full URI in handle_remote_ls_ctx() ---------------------------------------------------------------- [On Hold] @@ -185,8 +225,8 @@ them, and we can take it from there. - ls-files: add options to support sparse checkout - Introduce CE_NO_CHECKOUT bit -Kicked out of 'next' by popular demand (see recent discussion on the -interaction between the checkout area and commands such as "grep"). +Will drop shortly, but there may be some other fixes to CE_VALID, like +nd/grep-assume-unchanged topic above, that we may want to resurrect. * jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits - clone: test the new HEAD detection logic @@ -199,7 +239,8 @@ interaction between the checkout area and commands such as "grep"). - get_remote_heads(): refactor code to read "server capabilities" An attempt to extend the fetch protocol to make the logic to detect where -HEAD on the origin site points to more robust. +HEAD on the origin site points to more robust. Will drop shortly as the +protocol extension was not very popular. * cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits - bisect: add "--no-replace" option to bisect without using replace @@ -215,19 +256,13 @@ HEAD on the origin site points to more robust. - bisect: add test cases for "git bisect replace" - bisect: add "git bisect replace" subcommand -I think a mechanism like this should be added to replace grafts, but it -should always be enabled for normal revision traversal operation, while -always disabled for object enumeration and transfer operation (iow, fsck, -fetch and push should use the real ancestry information recorded in the -underlying objects, while rev-list, log, etc. should always use the -replaced objects). I have a suspicion that even cat-file could honor it. +Will drop and replace it with the resubmitted series when it comes. * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit - "git push": tellme-more protocol extension This seems to have a deadlock during communication between the peers. -Someone needs to pick up this topic and resolve the deadlock before it can -continue. +Will drop shortly. * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit - diff: enable "too large a rename" warning when -M/-C is explicitly @@ -245,3 +280,4 @@ this back for now. - stripspace: use parse_options() - Add "git am -s" test - git-am: refactor code to add signed-off-by line for the committer +