{"thread":{"id":"15902","subject":"What's cooking in git.git (Oct 2008, #03; Tue, 14)","startedAt":"2008-10-14T22:08:54Z","lastAt":"2008-10-18T20:12:47Z","messageCount":6,"participants":["Junio C Hamano","Stephen Haberman","Johannes Sixt","Nguyen Thai Ngoc Duy","Thomas Rast"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"93035","messageId":"7v8wsq7rt5.fsf@gitster.siamese.dyndns.org","threadId":"15902","inReplyTo":null,"subject":"What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-14T22:08:54Z","receivedAt":"2008-10-14T22:08:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here 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\nThis round I haven't added anything new yet.  Just getting my development\nrepository back into shape and in sync with what I received from Shawn.\n\n----------------------------------------------------------------\n[New Topics]\n\n* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit\n - Fix fetch/pull when run without --update-head-ok\n\nThis looked sane to me.\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.  Shawn says he's been too swamped at\nday-job to actively review the series.  There has been some discussion on\nlist about it so its not stalled, but it needs more eyeballs.\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 don't\nget 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\nRéne had good comments on how the callback should be 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\nI think this is still buggy and drops the option when am stops with\nconflicts.\n\n----------------------------------------------------------------\n[Will be merged to 'master' soon]\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\nShawn thinks this topic is settled for now, and I see that the new output\nformat does not bother me very much, so please expect this to be merged\nsoon.\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\nShawn says that an update came in recently, but they are not here yet.\nI'd need to dig it up, but I haven't had time.\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.  Lacks\ndocumentation 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* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit\n + rebase: Support preserving merges in non-interactive mode\n\n* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits\n - rebase-i-p: if todo was reordered use HEAD as the rewritten parent\n - rebase-i-p: do not include non-first-parent commits touching\n   UPSTREAM\n - rebase-i-p: only list commits that require rewriting in todo\n - rebase-i-p: fix 'no squashing merges' tripping up non-merges\n - rebase-i-p: delay saving current-commit to REWRITTEN if squashing\n - rebase-i-p: use HEAD for updating the ref instead of mapping\n   OLDHEAD\n - rebase-i-p: test to exclude commits from todo based on its parents\n\nChanges the `rebase -i -p` behavior to behave like git sequencer's\nrewrite of `rebase -i` would behave.\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\nTentatively dropped from everwhere, waiting for a reroll together with\nsh/rebase-i-p.\n\n* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits\n - (squash): index-pack: do not unconditionally make packfile read-\n   only\n - Do not rename read-only files during a push\n\nSupposedly fixes pack file renames on Windows.  The (squash) patch is my\nattempt to fix its breakage.\n\n* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit\n - describe: Make --tags and --all match lightweight tags more often\n\nWhen the user gives --tags, the request is asking to treat lightweight and\nannotated tags at equal weight, and if lightweight ones are closer, they\nshould be used.\n\n* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits\n - (squash) adjust test vector for new behaviour of format-patch\n - format-patch: autonumber by default\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* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits\n + check-attr: Add --stdin option\n + check-attr: add an internal check_attr() function\n\nBatch attr lookup via --stdin, for gitk and git-gui.\n\n* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit\n + Implement git clone -v\n\nDoes what it says it does.  This may be ready for master soon,\nits a pretty trivial change.\n\n* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit\n + gitweb: refactor input parameters parse/validation\n\nA major cleanup on the way gitweb parses its input arguments.\nFuture gitweb patches to add more arguments into the PATH_INFO\ndepend upon this initial cleanup work.\n\n* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit\n - compat/cygwin.c - Use cygwin's stat if core.filemode == true\n\nIs ready for 'next'.\n\n* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit\n - gitweb: Better processing format string in custom links in navbar\n\nWaiting for some sort of response from Pasky.\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\nI started making this incremental but the progress is not\nso 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/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nThis seems to have a deadlock during communication between the peers.\nSomeone needs to pick up this topic and resolve the deadlock before it can\ncontinue.\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* 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\nThis would be the right thing to do for command line use,\nbut gitk will be hit due to tcl/tk's limitation, so I am holding\nthis back for now.\n"},{"id":"93060","messageId":"20081015020128.a5d2c83b.stephen@exigencecorp.com","threadId":"15902","inReplyTo":"7v8wsq7rt5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Stephen Haberman","fromEmail":"stephen@exigencecorp.com","sentAt":"2008-10-15T07:01:28Z","receivedAt":"2008-10-15T07:01:28Z","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> Tentatively dropped from everwhere, waiting for a reroll together with\n> sh/rebase-i-p.\n\nAssuming sh/maint-rebase3 goes before sh/rebase-i-p, there are no\nchanges to it. I rebased it on top of sp/maint and the tests passed.\n\n> * sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits\n>  - rebase-i-p: if todo was reordered use HEAD as the rewritten parent\n>  - rebase-i-p: do not include non-first-parent commits touching\n>    UPSTREAM\n>  - rebase-i-p: only list commits that require rewriting in todo\n>  - rebase-i-p: fix 'no squashing merges' tripping up non-merges\n>  - rebase-i-p: delay saving current-commit to REWRITTEN if squashing\n>  - rebase-i-p: use HEAD for updating the ref instead of mapping\n>    OLDHEAD\n>  - rebase-i-p: test to exclude commits from todo based on its parents\n> \n> Changes the `rebase -i -p` behavior to behave like git sequencer's\n> rewrite of `rebase -i` would behave.\n\nAttempting to follow your previous advice, I merged sp/master onto my\nlocal sh/maint-rebase3, and rebased sh/rebase-i-p on top that resulting\nmerge, and got the changes fixed to play nicely with sh/maint-rebase3\n+master, and integrated your feedback.\n\nI'll be sending the new sh/rebase-i-p series soon.\n\nLet me know if I did the wrong thing--your comment of maint-rebase3\n\"waiting for a reroll\" makes me think you wanted that one rebased on\ntop of rebase-i-p, when I just got done doing the opposite (I hadn't\nchecked the git list before hacking on it).\n\nThanks,\nStephen\n"},{"id":"93079","messageId":"48F5AB87.4080409@viscovery.net","threadId":"15902","inReplyTo":"7v8wsq7rt5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-10-15T08:36:23Z","receivedAt":"2008-10-15T08:36:23Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Junio C Hamano schrieb:\n> * pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits\n>  - (squash): index-pack: do not unconditionally make packfile read-\n>    only\n>  - Do not rename read-only files during a push\n> \n> Supposedly fixes pack file renames on Windows.  The (squash) patch is my\n> attempt to fix its breakage.\n\nI'm afraid I can't reproduce the problem that the commit message\ndescribes. (But then I don't know whether I understand it correctly\nbecause it talks about \"push to local repository\", and I'm not sure how to\nread this).\n\nGoogling around indicates that this is a Samba bug:\nhttp://lists.samba.org/archive/samba/2005-July/108941.html\nOTOH, svn has considered a workaround for a similar problem just last week:\nhttp://www.nabble.com/-PATCH--Fix-for-renaming-errors-on-Samba-working-copies.-td19854585.html\nI cannot tell what the situation with current Samba versions is. Pasky?\n\n-- Hannes\n"},{"id":"93084","messageId":"fcaeb9bf0810150454g572f6147w6a61d770ba28e808@mail.gmail.com","threadId":"15902","inReplyTo":"7v8wsq7rt5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Nguyen Thai Ngoc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-10-15T11:54:44Z","receivedAt":"2008-10-15T11:54:44Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On 10/15/08, Junio C Hamano <gitster@pobox.com> wrote:\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>\n>  Recently updated with a repost.  Shawn says he's been too swamped at\n>  day-job to actively review the series.  There has been some discussion on\n>  list about it so its not stalled, but it needs more eyeballs.\n\nJust a bit of update. I'm still working on the second half. Code\nchange is even more than this, so I will wait until the first half\ngets reviewed and accepted before sending the rest.\n\nBTW, in the first half, unpack_trees()-related commands may refuse to\nwork if there is orphaned/stale entries in working directory\n(verify_*() functions still look at working directory no matter\nwhether entries are no-checkout). Those entries are troublesome anyway\nso encouraging people to clean them out is, IMHO, a good idea, rather\nthan fixing unpack_trees() to ignore them.\n-- \nDuy\n"},{"id":"93211","messageId":"200810161753.06318.trast@student.ethz.ch","threadId":"15902","inReplyTo":"7v8wsq7rt5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2008-10-16T15:53:03Z","receivedAt":"2008-10-16T15:53:03Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"You wrote:\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> Shawn says that an update came in recently, but they are not here yet.\n> I'd need to dig it up, but I haven't had time.\n\nThe one you commented on was the last iteration.  I hope to find the\ntime to reroll the next (perhaps final) iteration this weekend.\n\n- Thomas\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n\n"},{"id":"93385","messageId":"200810182212.47166.johannes.sixt@telecom.at","threadId":"15902","inReplyTo":"48F5AB87.4080409@viscovery.net","subject":"Re: What's cooking in git.git (Oct 2008, #03; Tue, 14)","fromName":"Johannes Sixt","fromEmail":"johannes.sixt@telecom.at","sentAt":"2008-10-18T20:12:47Z","receivedAt":"2008-10-18T20:12:47Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"On Mittwoch, 15. Oktober 2008, Johannes Sixt wrote:\n> Junio C Hamano schrieb:\n> > * pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits\n> >  - (squash): index-pack: do not unconditionally make packfile read-\n> >    only\n> >  - Do not rename read-only files during a push\n> >\n> > Supposedly fixes pack file renames on Windows.  The (squash) patch is my\n> > attempt to fix its breakage.\n>\n> I'm afraid I can't reproduce the problem that the commit message\n> describes.\n\nOn a different system I was able to reproduce the problem, and this patch \nfixes it.\n\nI tried to fix the breakage in the compat layer, but the result was too \nfragile (change the source to read-write before that operation, change to \nread-only afterwards), and this patch (including your fixup) looks much \ncleaner.\n\n-- Hannes\n"}]}