{"thread":{"id":"15802","subject":"What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)","startedAt":"2008-10-06T16:59:43Z","lastAt":"2008-10-07T14:50:04Z","messageCount":4,"participants":["Shawn O. Pearce","Stephen Haberman","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"92427","messageId":"20081006165943.GG8203@spearce.org","threadId":"15802","inReplyTo":null,"subject":"What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-10-06T16:59:43Z","receivedAt":"2008-10-06T16:59:43Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)\n--------------------------------------------------\n\nHere are the topics that have been cooking.  Commits prefixed\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.  The topics\nmeant to be merged to the maintenance series have \"maint-\" in their names.\n\nTopics aren't sorted by name; I have tried to cluster them together\nto tell the story of how 'next' and 'pu' have evolved this past week.\n\n----------------------------------------------------------------\n[New Topics]\n\n* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit\n . docs: Improve the description of describe --tags\n\nI'm probably going to drop this topic if I can ever get around to\nformally writing and posting sp/describe-lwtag for review.\n\n* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit\n - [WIP] Change meaning of --tags and --all\n\nModifies \"git describe --tags\" to allow matching against lightweight\ntags even when an annotated tag is found in the history.  Its not\nin next because I haven't formally written a commit message and\nposted the patch for discussion on the list.\n\nThis is a fairly significant change in behavior.  Its most certainly\n1.6.1 material, but many argue the change is the _correct_ behavior\nand the current behavior in 1.6.0 is buggy.\n\n* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits\n - diff: add filter for converting binary to text\n - diff: introduce diff.<driver>.binary\n - diff: unify external diff and funcname parsing code\n - t4012: use test_cmp instead of cmp\n\nA general cleanup on how diff drivers are implemented.  Its still\nmissing documentation updates and tests but doesn't break anything\ncurrent as far as I can tell.  It needs more review before it can\nbe slated for 'next'.\n\n* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit\n - Do not rename read-only files during a push\n\nSupposedly fixes pack file renames on Windows, but it makes the\ntest suite fail on Linux.  I haven't debugged why yet.  Its very\nlikely we need a replacement patch before this can move forward.\n\n* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit\n - format-patch: autonumber by default\n\nFails the test suite; some of the test vectors need to be updated\nto account for the new default.  Someone who cares about this\nchange should follow through on the test suite update, or this may\nget dropped.\n\n* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit\n + Fix interactive rebase on dropped commits.\n\nThis merged to next, then was reverted out this morning, due to\nthe introduction of the sh/maint-rebase3.  Its dead and will be\ndropped from the next \"What's cooking\" release notes.\n\n* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit\n - rebase--interactive: fix parent rewriting for dropped commits\n\nA replacement for sh/maint-intrebase.  Its in pu because I have\ngotten 3 different versions of this patch, two of them posted a\nfull 4 days after I merged the first version into next.  I felt\nburned by the patch author for not keeping up with my tree, so I'm\nnot merging the patch to next.\n\nAt this point its going to sit in pu until Junio comes back.\nI think the topic needs a few more days to settle to see if the\npatch author is going to submit any more revisions.\n\n* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit\n + rebase --no-verify\n\nThis adds --no-verify to git rebase, to avoid the pre-rebase hook.\nLacks documentation but otherwise looks sound.\n\n* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit\n + builtin-commit: use reduce_heads() only when appropriate\n\nFixes \"git merge --no-ff --no-commit\".\n\n* dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits\n + cygwin: Use native Win32 API for stat\n + mingw: move common functionality to win32.h\n + add have_git_dir() function\n\nPerformance improvement for Cygwin, bypassing the Cygwin stat\nfunction and using one more like MinGW uses.  Probably ready for\nmaster on the next round.  Several Cygwin users have given praise\nto the series.\n\n* js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit\n + Teach git diff about Objective-C syntax\n\nAdds support for Objective-C function headers.  I don't use\nObjective-C so I can't comment on how good/bad the patterns are\nfor the language.  Feedback (and improvements if necessary) from\nObjective-C users would be appreciated.\n\n* dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit\n + Add git-svn branch to allow branch creation in SVN repositories\n\nAdds \"git svn branch\" to build branches remotely in SVN.\n\nMight be ready for master, it has an ACK from Eric.  Slated into next\njust because I wasn't sure if Junio merges such things immediately\ninto master or lets them cook for a bit.\n\n* pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits\n + Merge branch 'pb/gitweb-tagcloud' into pb/gitweb\n + gitweb: Support for simple project search form\n + gitweb: Make the by_tag filter delve in forks as well\n + gitweb: Support for tag clouds\n + gitweb: Add support for extending the action bar with custom links\n + gitweb: Sort the list of forks on the summary page by age\n + gitweb: Clean-up sorting of project list\n\nI may have been a bad interm maintainer here by shoving together\ntwo different gitweb series from Pasky.  Overall the combined set\nlooks ready to me.\n\n* ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits\n + parse-opt: migrate builtin-merge-file.\n + parse-opt: migrate git-merge-base.\n + parse-opt: migrate fmt-merge-msg.\n\n* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit\n + git grep: Add \"-z/--null\" option as in GNU's grep.\n\n* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit\n + builtin-merge: refresh the index before calling a strategy\n\n* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit\n + xdiff-interface.c: strip newline (and cr) from line before pattern\n   matching\n\n* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit\n + rebase: Support preserving merges in non-interactive mode\n\nThese last five all look ready for master, but should cook longer\nthan just a few days.\n\n----------------------------------------------------------------\n[Old New Topics]\n\n* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits\n + bash completion: Add --[no-]validate to \"git send-email\"\n + send-email: signedoffcc -> signedoffbycc, but handle both\n + Docs: send-email: Create logical groupings for man text\n + Docs: send-email: Create logical groupings for --help text\n + Docs: send-email: Remove unnecessary config variable description\n + Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to\n + send-email: change --no-validate to boolean --[no-]validate\n + Docs: send-email: Man page option ordering\n + Docs: send-email usage text much sexier\n + Docs: send-email's usage text and man page mention same options\n\nThis series looks pretty good to me.  It probably can merge to\nmaster on the next \"What's cooking\" cycle.\n\n----------------------------------------------------------------\n[Dropped Topics]\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n + merge: remove deprecated summary and diffstat options and config\n   variables\n\nThis has been reverted from next and is being dropped.  Its too\nsoon to remove a feature that was just added in 1.5.6 timeframe.\nPerhaps in 1.7.0 this can be revisited.\n\n----------------------------------------------------------------\n[Stuck Topics]\n\n* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits\n - grep: skip files outside sparse checkout area\n - checkout_entry(): CE_NO_CHECKOUT on checked out entries.\n - Prevent diff machinery from examining worktree outside sparse\n   checkout\n - ls-files: Add tests for --sparse and friends\n - update-index: add --checkout/--no-checkout to update\n   CE_NO_CHECKOUT bit\n - update-index: refactor mark_valid() in preparation for new options\n - ls-files: add options to support sparse checkout\n - Introduce CE_NO_CHECKOUT bit\n - Extend index to save more flags\n\nRecently updated with a repost.  I've been too swamped at day-job\nto actively review the series.  There has been some discussion on\nlist about it so its not stalled, but it needs more eyeballs.\n\n* gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits\n - gitweb: generate parent..current URLs\n - gitweb: parse parent..current syntax from pathinfo\n - gitweb: use_pathinfo filenames start with /\n - gitweb: generate project/action/hash URLs\n - gitweb: refactor input parameters parse/validation\n - gitweb: parse project/action/hash_base:filename PATH_INFO\n\nStill going through revisions on the git ML.  Its great work and\nis heading in the right direction.  But the discussion and patch\ngeneration rate is too high to merge the topic into next just yet.\n\nSo its waiting for a re-roll of the series once discussion settles\ndown and there is a final patch series available.\n\n----------------------------------------------------------------\n[Stalled -- Needs Action to Proceed (or to be dropped)]\n\n* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit\n - t7400: Add short \"git submodule add\" testsuite\n\nStill waiting for a reroll.  Should be dropped next week if we\ndon't get one during this coming week.\n\n* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits\n - Use xdiff caching to improve git blame performance\n - Allow xdiff machinery to cache hash results for a file\n - Always initialize xpparam_t to 0\n - Bypass textual patch generation and parsing in git blame\n - Allow alternate \"low-level\" emit function from xdl_diff\n\n(jc: Réne had good comments on how the callback should be\n structured.)\n\n* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit\n - git-am: Pass the --directory option through to git-apply\n\n(jc: I think this is still buggy and drops the option when am stops\n with conflicts.)\n\nAll three of these are stalled.  I'm not going to drop them just\nyet, but Junio's comments still hold.  If there's no action on\nthese next week we may seem them drop off.\n\n----------------------------------------------------------------\n[Will be merged to 'master/maint' soon]\n\n* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit\n + git-add --intent-to-add (-N)\n\nTeaches \"git add\" to record only the intent to add a path later.\n(jc: I rerolled this without the fake empty blob object.)\n\n* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit\n + make prune report removed objects on -v\n\nThis is a pretty trivial new feature.\n\n* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits\n + tutorial: update output of git commit\n + reformat informational commit message\n + git commit: Reformat output somewhat\n + builtin-commit.c: show on which branch a commit was added\n\nI think this topic is settled for now.\n\n* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit\n + Makefile: do not set NEEDS_LIBICONV for Solaris 8\n\n* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits\n + rebase -i: remove leftover debugging\n + rebase -i: proper prepare-commit-msg hook argument when squashing\n\n* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit\n + git-stash.sh: fix flawed fix of invalid ref handling (commit\n   da65e7c1)\n\nThe latter three are ready for 'maint'.  I felt burned by a bad\ncommit into made directly into maint earlier in the week so these\nwound up getting queued into 'next' first, even though they are\ncertainly maint material.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits\n + Documentation: Refer to git-rebase(1) to warn against rewriting\n + Documentation: new upstream rebase recovery section in git-rebase\n\n(jc: My impression from the last round of discusson on the third\n patch in this series (not queued here) was that as long as we\n do not present it as \"One True Workflow\", the description was\n a good starting point, possibly others to add other recommended\n flows later.)\n\nI haven't looked at this series yet.  Based on Junio's remarks above\nI'm looking for more input on this series before it goes anywhere.\n\n* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit\n + date/time: do not get confused by fractional seconds\n\nI need to look at this in more detail.  I suspect we can merge\nthis to master soon, but its been kicking around since Aug 16th.\nI need to look at it to see if there's any obvious reason why Junio\nhas no notes on this branch and why it hasn't merged yet.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits\n - revision --simplify-merges: incremental simplification\n - revision --simplify-merges: prepare for incremental simplification\n\n(jc: I started making this incremental but the progress is not\n so great.)\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n   lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\n(jc: The one at second from the tip needs reworking.)\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nThis is a great idea, but IIRC its implementation has a deadlock\nduring communication between the peers.  Someone needs to pick up\nthis topic and resolve the deadlock before it can continue.\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n   format\n - git-blame: refactor code to emit \"porcelain format\" output\n\n* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit\n . WIP: start teaching the --whitespace=fix to merge machinery\n\nThis has a merge conflict with `next` and isn't even in pu right now.\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n   asked for\n\n(jc: This would be the right thing to do for command line use,\n but gitk will be hit due to tcl/tk's limitation, so I am holding\n this back for now.)\n\n-- \nShawn.\n"},{"id":"92448","messageId":"20081006154849.6317f314.stephen@exigencecorp.com","threadId":"15802","inReplyTo":"20081006165943.GG8203@spearce.org","subject":"Re: What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)","fromName":"Stephen Haberman","fromEmail":"stephen@exigencecorp.com","sentAt":"2008-10-06T20:48:49Z","receivedAt":"2008-10-06T20:48:49Z","isPatch":false,"sender":{"key":"stephen@exigencecorp.com","avatar":"https://gravatar.com/avatar/23b93ad70a06ce53505f17ddba65176edbcfb6588e7a4c1a2dca04aaf0a6aff1?d=mp&s=160"},"body":"\n> * sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit\n>  - rebase--interactive: fix parent rewriting for dropped commits\n> \n> A replacement for sh/maint-intrebase.  Its in pu because I have\n> gotten 3 different versions of this patch, two of them posted a\n> full 4 days after I merged the first version into next.  I felt\n> burned by the patch author for not keeping up with my tree, so I'm\n> not merging the patch to next.\n>\n> At this point its going to sit in pu until Junio comes back.\n> I think the topic needs a few more days to settle to see if the\n> patch author is going to submit any more revisions.\n\nAll fair enough.\n\nSorry for not keeping up with your tree--this was the first I heard my\nfirst patch had made it into next, so I kept submitting new ones not\nreally knowing why they weren't generating feedback. My fault for not\nactively looking into the pu/next thing--I'll know what to do next time.\n\nThanks,\nStephen\n"},{"id":"92450","messageId":"20081006210303.GA30812@coredump.intra.peff.net","threadId":"15802","inReplyTo":"20081006165943.GG8203@spearce.org","subject":"Re: What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-10-06T21:03:03Z","receivedAt":"2008-10-06T21:03:03Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Oct 06, 2008 at 09:59:43AM -0700, Shawn O. Pearce wrote:\n\n> * jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits\n>  - diff: add filter for converting binary to text\n>  - diff: introduce diff.<driver>.binary\n>  - diff: unify external diff and funcname parsing code\n>  - t4012: use test_cmp instead of cmp\n> \n> A general cleanup on how diff drivers are implemented.  Its still\n> missing documentation updates and tests but doesn't break anything\n> current as far as I can tell.  It needs more review before it can\n> be slated for 'next'.\n\nI should note, too, that this is in direct competition with Matthieu\nMoy's \"Implementation of a textconv filter for easy custom diff\" posted\nabout a week ago. So if you are reviewing this series, please review\nboth and decide which you think is more sensible.\n\n-Peff\n"},{"id":"92534","messageId":"20081007145004.GA4674@spearce.org","threadId":"15802","inReplyTo":"20081006210303.GA30812@coredump.intra.peff.net","subject":"Re: What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-10-07T14:50:04Z","receivedAt":"2008-10-07T14:50:04Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Jeff King <peff@peff.net> wrote:\n> On Mon, Oct 06, 2008 at 09:59:43AM -0700, Shawn O. Pearce wrote:\n> \n> > * jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits\n> >  - diff: add filter for converting binary to text\n> >  - diff: introduce diff.<driver>.binary\n> >  - diff: unify external diff and funcname parsing code\n> >  - t4012: use test_cmp instead of cmp\n> > \n> > A general cleanup on how diff drivers are implemented.  Its still\n> > missing documentation updates and tests but doesn't break anything\n> > current as far as I can tell.  It needs more review before it can\n> > be slated for 'next'.\n> \n> I should note, too, that this is in direct competition with Matthieu\n> Moy's \"Implementation of a textconv filter for easy custom diff\" posted\n> about a week ago. So if you are reviewing this series, please review\n> both and decide which you think is more sensible.\n\nTo be clear, Jeff's series is in pu because it seems reasonable on\nthe surface and applied cleanly to my master branch.  Matthieu's\nbranch didn't apply cleanly, and I didn't really have the time to\nfigure out why and hand fix it.\n\nSo my carrying of Jeff's series and not Matthieu's is not an\nendorsement one way or the other.  It was simply a matter of trying\nto help the topic get exposure with the least amount of effort on\nmy part.\n\n-- \nShawn.\n"}]}