What's cooking (2008/10 #02)

index 511f371092..03c737881b 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,8 +1,8 @@ -Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06) -X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed -X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3 +Subject: What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12) +X-master-at: 5c283eb13c94be6ca974aa722159dc9838d10d97 +X-next-at: 340fcf496c9eb7c8be7f14efdd282666a6b6a1f1 -What's cooking in git.git (Oct 2008, #01; Mon, 06) +What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -12,86 +12,86 @@ in 'next'. The topics list the commits in reverse chronological order. The topics meant to be merged to the maintenance series have "maint-" in their names. -Topics aren't sorted by name; I have tried to cluster them together -to tell the story of how 'next' and 'pu' have evolved this past week. +gitster's back and I'm expecting he will take over from here. ---------------------------------------------------------------- [New Topics] -* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit - . docs: Improve the description of describe --tags +* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits + + check-attr: Add --stdin option + + check-attr: add an internal check_attr() function -I'm probably going to drop this topic if I can ever get around to -formally writing and posting sp/describe-lwtag for review. +Batch attr lookup via --stdin, for gitk and git-gui. -* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit - - [WIP] Change meaning of --tags and --all +* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit + + Implement git clone -v -Modifies "git describe --tags" to allow matching against lightweight -tags even when an annotated tag is found in the history. Its not -in next because I haven't formally written a commit message and -posted the patch for discussion on the list. +Does what it says it does. This may be ready for master soon, +its a pretty trivial change. -This is a fairly significant change in behavior. Its most certainly -1.6.1 material, but many argue the change is the _correct_ behavior -and the current behavior in 1.6.0 is buggy. +* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit + + gitweb: refactor input parameters parse/validation -* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits - - diff: add filter for converting binary to text - - diff: introduce diff.<driver>.binary - - diff: unify external diff and funcname parsing code - - t4012: use test_cmp instead of cmp +A major cleanup on the way gitweb parses its input arguments. +Future gitweb patches to add more arguments into the PATH_INFO +depend upon this initial cleanup work. -A general cleanup on how diff drivers are implemented. Its still -missing documentation updates and tests but doesn't break anything -current as far as I can tell. It needs more review before it can -be slated for 'next'. +* ml/cygwin-filemode (Sun Oct 12 14:44:46 2008 -0400) 1 commit + - compat/cygwin.c - Use cygwin's stat if core.filemode == true -* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit - - Do not rename read-only files during a push +I think another version may be coming to reuse the core.filemode +parsing so this patch isn't in next yet. -Supposedly fixes pack file renames on Windows, but it makes the -test suite fail on Linux. I haven't debugged why yet. Its very -likely we need a replacement patch before this can move forward. +* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits + - rebase-i-p: if todo was reordered use HEAD as the rewritten parent + - rebase-i-p: do not include non-first-parent commits touching + UPSTREAM + - rebase-i-p: only list commits that require rewriting in todo + - rebase-i-p: fix 'no squashing merges' tripping up non-merges + - rebase-i-p: delay saving current-commit to REWRITTEN if squashing + - rebase-i-p: use HEAD for updating the ref instead of mapping + OLDHEAD + - rebase-i-p: test to exclude commits from todo based on its parents -* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit - - format-patch: autonumber by default - -Fails the test suite; some of the test vectors need to be updated -to account for the new default. Someone who cares about this -change should follow through on the test suite update, or this may -get dropped. +Changes the `rebase -i -p` behavior to behave like git sequencer's +rewrite of `rebase -i` would behave. Its parked in pu because I +have not had the time to review the series in detail. First glance +looked OK to me. -* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit - + Fix interactive rebase on dropped commits. +* js/keephardlinks (Sat Oct 11 13:45:13 2008 +0200) 1 commit + - Introduce core.keepHardLinks -This merged to next, then was reverted out this morning, due to -the introduction of the sh/maint-rebase3. Its dead and will be -dropped from the next "What's cooking" release notes. +The value of this change is currently in question, and the commit +message doesn't justify it very well. -* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit - - rebase--interactive: fix parent rewriting for dropped commits +* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit + - gitweb: Better processing format string in custom links in navbar -A replacement for sh/maint-intrebase. Its in pu because I have -gotten 3 different versions of this patch, two of them posted a -full 4 days after I merged the first version into next. I felt -burned by the patch author for not keeping up with my tree, so I'm -not merging the patch to next. +Waiting for some sort of response from Pasky. -At this point its going to sit in pu until Junio comes back. -I think the topic needs a few more days to settle to see if the -patch author is going to submit any more revisions. +---------------------------------------------------------------- +[Graduated to "master"] -* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit - + rebase --no-verify +* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits + + bash completion: Add --[no-]validate to "git send-email" + + send-email: signedoffcc -> signedoffbycc, but handle both + + Docs: send-email: Create logical groupings for man text + + Docs: send-email: Create logical groupings for --help text + + Docs: send-email: Remove unnecessary config variable description + + Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to + + send-email: change --no-validate to boolean --[no-]validate + + Docs: send-email: Man page option ordering + + Docs: send-email usage text much sexier + + Docs: send-email's usage text and man page mention same options -This adds --no-verify to git rebase, to avoid the pre-rebase hook. -Lacks documentation but otherwise looks sound. +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit + + git-add --intent-to-add (-N) -* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit - + builtin-commit: use reduce_heads() only when appropriate +* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit + + make prune report removed objects on -v -Fixes "git merge --no-ff --no-commit". +* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit + + date/time: do not get confused by fractional seconds * dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits + cygwin: Use native Win32 API for stat @@ -106,20 +106,13 @@ to the series. * js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit + Teach git diff about Objective-C syntax -Adds support for Objective-C function headers. I don't use -Objective-C so I can't comment on how good/bad the patterns are -for the language. Feedback (and improvements if necessary) from -Objective-C users would be appreciated. +Adds support for Objective-C function headers. * dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit + Add git-svn branch to allow branch creation in SVN repositories Adds "git svn branch" to build branches remotely in SVN. -Might be ready for master, it has an ACK from Eric. Slated into next -just because I wasn't sure if Junio merges such things immediately -into master or lets them cook for a bit. - * pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits + Merge branch 'pb/gitweb-tagcloud' into pb/gitweb + gitweb: Support for simple project search form @@ -129,10 +122,6 @@ into master or lets them cook for a bit. + gitweb: Sort the list of forks on the summary page by age + gitweb: Clean-up sorting of project list -I may have been a bad interm maintainer here by shoving together -two different gitweb series from Pasky. Overall the combined set -looks ready to me. - * ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits + parse-opt: migrate builtin-merge-file. + parse-opt: migrate git-merge-base. @@ -148,40 +137,77 @@ looks ready to me. + xdiff-interface.c: strip newline (and cr) from line before pattern matching -* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit - + rebase: Support preserving merges in non-interactive mode +* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit + + Makefile: do not set NEEDS_LIBICONV for Solaris 8 + +* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits + + rebase -i: remove leftover debugging + + rebase -i: proper prepare-commit-msg hook argument when squashing + +* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit + + git-stash.sh: fix flawed fix of invalid ref handling (commit + da65e7c1) -These last five all look ready for master, but should cook longer -than just a few days. +The latter three were merged to 'maint' first. ---------------------------------------------------------------- [Old New Topics] -* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits - + bash completion: Add --[no-]validate to "git send-email" - + send-email: signedoffcc -> signedoffbycc, but handle both - + Docs: send-email: Create logical groupings for man text - + Docs: send-email: Create logical groupings for --help text - + Docs: send-email: Remove unnecessary config variable description - + Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to - + send-email: change --no-validate to boolean --[no-]validate - + Docs: send-email: Man page option ordering - + Docs: send-email usage text much sexier - + Docs: send-email's usage text and man page mention same options +* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit + + rebase --no-verify -This series looks pretty good to me. It probably can merge to -master on the next "What's cooking" cycle. +This adds --no-verify to git rebase, to avoid the pre-rebase hook. +Lacks documentation but otherwise looks sound. ----------------------------------------------------------------- -[Dropped Topics] +* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit + + builtin-commit: use reduce_heads() only when appropriate + +Fixes "git merge --no-ff --no-commit". + +* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit + + rebase: Support preserving merges in non-interactive mode + +* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit + - rebase--interactive: fix parent rewriting for dropped commits + +A prior version of sh/rebase-i-p. This should be dropped. + +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit + - Do not rename read-only files during a push + +Supposedly fixes pack file renames on Windows, but it makes the +test suite fail on Linux. I haven't debugged why yet. Its very +likely we need a replacement patch before this can move forward. + +* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit + - describe: Make --tags and --all match lightweight tags more often + +Based on feedback from the list this needs another spin. I will +post a replacement patch soon. -* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit - + merge: remove deprecated summary and diffstat options and config - variables +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit + - format-patch: autonumber by default + +Fails the test suite; some of the test vectors need to be updated +to account for the new default. Someone who cares about this +change should follow through on the test suite update, or this may +get dropped. + +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit + . WIP: start teaching the --whitespace=fix to merge machinery + +This has a merge conflict with `next` and isn't even in pu right now. + +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits + - diff: add filter for converting binary to text + - diff: introduce diff.<driver>.binary + - diff: unify external diff and funcname parsing code + - t4012: use test_cmp instead of cmp -This has been reverted from next and is being dropped. Its too -soon to remove a feature that was just added in 1.5.6 timeframe. -Perhaps in 1.7.0 this can be revisited. +A general cleanup on how diff drivers are implemented. Its still +missing documentation updates and tests but doesn't break anything +current as far as I can tell. It needs more review before it can +be slated for 'next'. ---------------------------------------------------------------- [Stuck Topics] @@ -204,12 +230,12 @@ to actively review the series. There has been some discussion on list about it so its not stalled, but it needs more eyeballs. * gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits - - gitweb: generate parent..current URLs - - gitweb: parse parent..current syntax from pathinfo - - gitweb: use_pathinfo filenames start with / - - gitweb: generate project/action/hash URLs - - gitweb: refactor input parameters parse/validation - - gitweb: parse project/action/hash_base:filename PATH_INFO + . gitweb: generate parent..current URLs + . gitweb: parse parent..current syntax from pathinfo + . gitweb: use_pathinfo filenames start with / + . gitweb: generate project/action/hash URLs + . gitweb: refactor input parameters parse/validation + . gitweb: parse project/action/hash_base:filename PATH_INFO Still going through revisions on the git ML. Its great work and is heading in the right direction. But the discussion and patch @@ -243,24 +269,9 @@ don't get one during this coming week. (jc: I think this is still buggy and drops the option when am stops with conflicts.) -All three of these are stalled. I'm not going to drop them just -yet, but Junio's comments still hold. If there's no action on -these next week we may seem them drop off. - ---------------------------------------------------------------- [Will be merged to 'master/maint' soon] -* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit - + git-add --intent-to-add (-N) - -Teaches "git add" to record only the intent to add a path later. -(jc: I rerolled this without the fake empty blob object.) - -* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit - + make prune report removed objects on -v - -This is a pretty trivial new feature. - * pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits + tutorial: update output of git commit + reformat informational commit message @@ -269,22 +280,6 @@ This is a pretty trivial new feature. I think this topic is settled for now. -* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit - + Makefile: do not set NEEDS_LIBICONV for Solaris 8 - -* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits - + rebase -i: remove leftover debugging - + rebase -i: proper prepare-commit-msg hook argument when squashing - -* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit - + git-stash.sh: fix flawed fix of invalid ref handling (commit - da65e7c1) - -The latter three are ready for 'maint'. I felt burned by a bad -commit into made directly into maint earlier in the week so these -wound up getting queued into 'next' first, even though they are -certainly maint material. - ---------------------------------------------------------------- [Actively Cooking] @@ -298,16 +293,7 @@ certainly maint material. a good starting point, possibly others to add other recommended flows later.) -I haven't looked at this series yet. Based on Junio's remarks above -I'm looking for more input on this series before it goes anywhere. - -* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit - + date/time: do not get confused by fractional seconds - -I need to look at this in more detail. I suspect we can merge -this to master soon, but its been kicking around since Aug 16th. -I need to look at it to see if there's any obvious reason why Junio -has no notes on this branch and why it hasn't merged yet. +An update came in recently, but I haven't applied it. ---------------------------------------------------------------- [On Hold] @@ -320,13 +306,13 @@ has no notes on this branch and why it hasn't merged yet. so great.) * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits - - git-am --forge: add Signed-off-by: line for the author - - git-am: clean-up Signed-off-by: lines - - stripspace: add --log-clean option to clean up signed-off-by: + . git-am --forge: add Signed-off-by: line for the author + . git-am: clean-up Signed-off-by: lines + . stripspace: add --log-clean option to clean up signed-off-by: lines - - stripspace: use parse_options() - - Add "git am -s" test - - git-am: refactor code to add signed-off-by line for the committer + . stripspace: use parse_options() + . Add "git am -s" test + . git-am: refactor code to add signed-off-by line for the committer (jc: The one at second from the tip needs reworking.) @@ -342,11 +328,6 @@ this topic and resolve the deadlock before it can continue. format - git-blame: refactor code to emit "porcelain format" output -* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit - . WIP: start teaching the --whitespace=fix to merge machinery - -This has a merge conflict with `next` and isn't even in pu right now. - * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit - diff: enable "too large a rename" warning when -M/-C is explicitly asked for