{"thread":{"id":"22156","subject":"\"What's cooking\" incremental edition","startedAt":"2010-01-10T19:55:23Z","lastAt":"2010-01-12T16:27:36Z","messageCount":3,"participants":["Junio C Hamano","Sverre Rabbelier","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"131236","messageId":"7vmy0lpwes.fsf@alter.siamese.dyndns.org","threadId":"22156","inReplyTo":null,"subject":"\"What's cooking\" incremental edition","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-10T19:55:23Z","receivedAt":"2010-01-10T19:55:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is \"git show --ext-diff\" output in 'todo' branch (see README.cooking\nin the same branch) for today's updates to highlight the updated parts.\n\n-- >8 --\n\n-What's cooking in git.git (Jan 2010, #02; Thu, 07)\n+What's cooking in git.git (Jan 2010, #03; Sun, 10)\n \n Here are the topics that have been cooking.  Commits prefixed with '-' are\n only in 'pu' while commits prefixed with '+' are in 'next'.  The ones\n marked with '.' do not appear in any of the integration branches, but I am\n still holding onto them.\n-\n-The tip of 'next' has been rebuilt on top of the current 'master'.\n\n--------------------------------------------------\nBorn topics\n\n[New Topics]\n\n * bk/fix-relative-gitdir-file (2010-01-08) 2 commits\n  - Handle relative paths in submodule .git files\n  - Test update-index for a gitlink to a .git file\n\n * jc/ident (2010-01-08) 3 commits\n  - ident.c: treat $EMAIL as giving user.email identity explicitly\n   (merged to 'next' on 2010-01-10 at f1f9ded)\n  + ident.c: check explicit identity for name and email separately\n  + ident.c: remove unused variables\n\n * jc/ls-files-ignored-pathspec (2010-01-08) 4 commits\n  - ls-files: fix overeager pathspec optimization\n  - read_directory(): further split treat_path()\n  - read_directory_recursive(): refactor handling of a single path into a separate function\n  - t3001: test ls-files -o ignored/dir\n\n * js/exec-error-report (2010-01-10) 4 commits\n  - Improve error message when a transport helper was not found\n  - start_command: detect execvp failures early\n  - run-command: move wait_or_whine earlier\n  - start_command: report child process setup errors to the parent's stderr\n  (this branch uses il/vcs-helper.)\n\n--------------------------------------------------\nMoved from [New Topics] to [Cooking]\n\n * jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit\n- - checkout -m path: fix recreating conflicts\n+  (merged to 'next' on 2010-01-10 at df14116)\n+ + checkout -m path: fix recreating conflicts\n\n * jn/makefile (2010-01-06) 4 commits\n- - Makefile: consolidate .FORCE-* targets\n- - Makefile: learn to generate listings for targets requiring special flags\n- - Makefile: use target-specific variable to pass flags to cc\n- - Makefile: regenerate assembler listings when asked\n+  (merged to 'next' on 2010-01-10 at f5a5d42)\n+ + Makefile: consolidate .FORCE-* targets\n+ + Makefile: learn to generate listings for targets requiring special flags\n+ + Makefile: use target-specific variable to pass flags to cc\n+ + Makefile: regenerate assembler listings when asked\n\n--------------------------------------------------\nMoved from [Will graduate after a bit more cooking] to [Graduated to \"master\"]\n\n * tr/http-updates (2009-12-28) 4 commits\n\n * jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit\n\n * jk/push-to-delete (2009-12-30) 1 commit\n\n * mm/config-path (2009-12-30) 1 commit\n\n * pm/cvs-environ (2009-12-30) 1 commit\n\n * tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit\n\n * bg/maint-remote-update-default (2009-12-31) 1 commit\n\n--------------------------------------------------\nMoved from [Cooking] to [Will graduate after a bit more cooking]\n\n * cc/reset-more (2010-01-08) 8 commits\n- - t7111: check that reset options work as described in the tables\n+  (merged to 'next' on 2010-01-10 at 84730de)\n+ + t7111: check that reset options work as described in the tables\n   (merged to 'next' on 2010-01-06 at 96639cb)\n  + Documentation: reset: add some missing tables\n   (merged to 'next' on 2010-01-04 at 8802c2c)\n  + Fix bit assignment for CE_CONFLICTED\n   (merged to 'next' on 2010-01-03 at f83d4c6)\n  + \"reset --merge\": fix unmerged case\n  + reset: use \"unpack_trees()\" directly instead of \"git read-tree\"\n  + reset: add a few tests for \"git reset --merge\"\n  + Documentation: reset: add some tables to describe the different options\n  + reset: improve mixed reset error message when in a bare repo\n\n * rs/maint-archive-match-pathspec (2009-12-12) 1 commit\n\n-* il/vcs-helper (2009-12-09) 8 commits\n+* il/vcs-helper (2010-01-09) 9 commits\n+  (merged to 'next' on 2010-01-10 at 11e448e)\n+ + Reset possible helper before reusing remote structure\n   (merged to 'next' on 2010-01-06 at 7c79f42)\n  + Remove special casing of http, https and ftp\n  + Support remote archive from all smart transports\n  + Support remote helpers implementing smart transports\n  + Support taking over transports\n  + Refactor git transport options parsing\n  + Pass unknown protocols to external protocol handlers\n  + Support mandatory capabilities\n  + Add remote helper debug mode\n+ (this branch is used by js/exec-error-report.)\n\n--------------------------------------------------\nMoved from [Cooking] to [Stalled]\n\n * jh/commit-status (2009-12-07) 1 commit\n\n * mh/rebase-fixup (2009-12-07) 2 commits\n-Initial round of \"fixup\" action that is similar to \"squash\" action in\n-\"rebase -i\" that excludes the commit log message from follow-up commits\n-when composing the log message for the updated one.  Expected is a further\n-improvement to skip opening the editor if a pick is followed only by\n-\"fixup\" and no \"squash\".\n+Expecting further improvements to skip opening the editor if a pick is\n+followed only by \"fixup\" and no \"squash\".\n\n * ns/rebase-auto-squash (2009-12-08) 1 commit\n   (merged to 'next' on 2010-01-06 at da4e2f5)\n  + rebase -i --autosquash: auto-squash commits\n  (this branch uses mh/rebase-fixup.)\n+\n+Blocked by the above.\n\n * jh/notes (2009-12-07) 11 commits\n-http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!\n+Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183\n\n * ap/merge-backend-opts (2008-07-18) 6 commits\n\n--------------------------------------------------\nMoved from [Cooking] to [Graduated to \"master\"]\n\n * mm/diag-path-in-treeish (2009-12-07) 1 commit\n\n * fc/opt-quiet-gc-reset (2009-12-02) 1 commit\n\n--------------------------------------------------\nOther topics\n\n[Will graduate after a bit more cooking]\n\n * nd/sparse (2010-01-04) 25 commits\n- - t7002: test for not using external grep on skip-worktree paths\n- - t7002: set test prerequisite \"external-grep\" if supported\n+  (merged to 'next' on 2010-01-10 at fa73d6e)\n+ + t7002: test for not using external grep on skip-worktree paths\n+ + t7002: set test prerequisite \"external-grep\" if supported\n   (merged to 'next' on 2010-01-02 at 5499bbe)\n  + grep: do not do external grep on skip-worktree entries\n  + commit: correctly respect skip-worktree bit\n  + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID\n  + tests: rename duplicate t1009\n  + sparse checkout: inhibit empty worktree\n  + Add tests for sparse checkout\n  + read-tree: add --no-sparse-checkout to disable sparse checkout support\n  + unpack-trees(): ignore worktree check outside checkout area\n  + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index\n  + unpack-trees(): \"enable\" sparse checkout and load $GIT_DIR/info/sparse-checkout\n  + unpack-trees.c: generalize verify_* functions\n  + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone\n  + Introduce \"sparse checkout\"\n  + dir.c: export excluded_1() and add_excludes_from_file_1()\n  + excluded_1(): support exclude files in index\n  + unpack-trees(): carry skip-worktree bit over in merged_entry()\n  + Read .gitignore from index if it is skip-worktree\n  + Avoid writing to buffer in add_excludes_from_file_1()\n  + Teach Git to respect skip-worktree bit (writing part)\n  + Teach Git to respect skip-worktree bit (reading part)\n  + Introduce \"skip-worktree\" bit in index, teach Git to get/set this bit\n  + Add test-index-version\n  + update-index: refactor mark_valid() in preparation for new options\n+\n+I've queued the (close to) original tests for external grep, but as a belt\n+and suspender measure Nguyễn may also want to add the whitebox test\n+in the review thread.\n\n[Cooking]\n\n-* da/difftool (2009-12-22) 2 commits\n+* da/difftool (2010-01-09) 6 commits\n+  (merged to 'next' on 2010-01-10 at 749c870)\n+ + git-diff.txt: Link to git-difftool\n+ + difftool: Allow specifying unconfigured commands with --extcmd\n+ + difftool--helper: Remove use of the GIT_MERGE_TOOL variable\n+ + difftool--helper: Update copyright and remove distracting comments\n   (merged to 'next' on 2010-01-06 at e957395)\n  + git-difftool: Add '--gui' for selecting a GUI tool\n  + t7800-difftool: Set a bogus tool for use by tests\n\n * jh/gitweb-cached (2010-01-03) 4 commits\n-Will merge to 'next', unless I hear objections within a few days.\n+Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306\n\n * jc/fix-tree-walk (2009-09-14) 7 commits\n Resurrected from \"Ejected\" category.  This is fix for a tricky codepath\n and testing and improving before it hits 'next' by brave souls is greatly\n-appreciated.  I am not very happy about the solution myself.\n+appreciated (I am using this in my private build).\n\n * jc/branch-d (2009-12-29) 1 commit\n- - branch -d: base the \"already-merged\" safety on the branch it merges with\n-\n+  (merged to 'next' on 2010-01-10 at 61a14b7)\n+ + branch -d: base the \"already-merged\" safety on the branch it merges with\n-http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863\n-I am tempted to merge this to 'next', but please stop me if people see issues\n-in it.\n\n * jc/rerere (2009-12-04) 1 commit\n- - Teach --[no-]rerere-autoupdate option to merge, revert and friends\n+  (merged to 'next' on 2010-01-10 at e295b7f)\n+ + Teach --[no-]rerere-autoupdate option to merge, revert and friends\n\n * jk/run-command-use-shell (2010-01-01) 8 commits\n- - t4030, t4031: work around bogus MSYS bash path conversion\n- - diff: run external diff helper with shell\n- - textconv: use shell to run helper\n- - editor: use run_command's shell feature\n- - run-command: optimize out useless shell calls\n- - run-command: convert simple callsites to use_shell\n- - t0021: use $SHELL_PATH for the filter script\n- - run-command: add \"use shell\" option\n+  (merged to 'next' on 2010-01-10 at 7479e2a)\n+ + t4030, t4031: work around bogus MSYS bash path conversion\n+ + diff: run external diff helper with shell\n+ + textconv: use shell to run helper\n+ + editor: use run_command's shell feature\n+ + run-command: optimize out useless shell calls\n+ + run-command: convert simple callsites to use_shell\n+ + t0021: use $SHELL_PATH for the filter script\n+ + run-command: add \"use shell\" option\n \n\n * tc/clone-v-progress (2009-12-26) 4 commits\n- - clone: use --progress to force progress reporting\n- - clone: set transport->verbose when -v/--verbose is used\n- - git-clone.txt: reword description of progress behaviour\n- - check stderr with isatty() instead of stdout when deciding to show progress\n+  (merged to 'next' on 2010-01-10 at ec2bfd7)\n+ + clone: use --progress to force progress reporting\n+ + clone: set transport->verbose when -v/--verbose is used\n+ + git-clone.txt: reword description of progress behaviour\n+ + check stderr with isatty() instead of stdout when deciding to show progress\n \n\n * jc/cache-unmerge (2009-12-25) 9 commits\n-Will wait a bit more before moving it to 'next'.\n+Will wait a bit more before moving it to 'next'.  J6t spotted an issue\n+with \"rerere forget\" and has a test script.\n\n-* tr/http-push-ref-status (2009-12-24) 6 commits\n+* tr/http-push-ref-status (2010-01-08) 6 commits\n-Peff: $gmane/136169, 136167, 136168\n-RC: $gmane/136172\n+Rerolled.\n\n * sr/gfi-options (2009-12-04) 7 commits\n- - fast-import: add (non-)relative-marks feature\n- - fast-import: allow for multiple --import-marks= arguments\n- - fast-import: test the new option command\n- - fast-import: add option command\n- - fast-import: add feature command\n- - fast-import: put marks reading in its own function\n- - fast-import: put option parsing code in separate functions\n-\n-http://thread.gmane.org/gmane.comp.version-control.git/134540\n-\n+  (merged to 'next' on 2010-01-10 at 8b305fb)\n+ + fast-import: add (non-)relative-marks feature\n+ + fast-import: allow for multiple --import-marks= arguments\n+ + fast-import: test the new option command\n+ + fast-import: add option command\n+ + fast-import: add feature command\n+ + fast-import: put marks reading in its own function\n+ + fast-import: put option parsing code in separate functions\n-I haven't seen comments on this round, and I am tempted to merge it to\n-'next' soonish.  Please file complaints before I do so if people have\n-objections.\n\n--------------------------------------------------\nGone topics\n\nWas in [Graduated to \"master\"]\n\n * mo/bin-wrappers (2009-12-02) 3 commits\n   (merged to 'next' on 2010-01-03 at 8c5fa27)\n  + INSTALL: document a simpler way to run uninstalled builds\n  + run test suite without dashed git-commands in PATH\n  + build dashless \"bin-wrappers\" directory similar to installed bindir\n\n * mv/commit-date (2009-12-03) 2 commits\n   (merged to 'next' on 2010-01-03 at 1c45fdf)\n  + Document date formats accepted by parse_date()\n  + builtin-commit: add --date option\n\n * bg/maint-add-all-doc (2009-12-07) 4 commits\n   (merged to 'next' on 2010-01-03 at b19a323)\n  + squash! rm documentation--also mention add-u where we mention commit-a\n  + git-rm doc: Describe how to sync index & work tree\n  + git-add/rm doc: Consistently back-quote\n  + Documentation: 'git add -A' can remove files\n\n * so/cvsserver-update (2009-12-07) 1 commit\n   (merged to 'next' on 2010-01-03 at 99959b6)\n  + cvsserver: make the output of 'update' more compatible with cvs.\n\n * mg/tag-d-show (2009-12-10) 1 commit\n   (merged to 'next' on 2010-01-03 at 87657d2)\n  + tag -d: print sha1 of deleted tag\n\n * sb/maint-octopus (2009-12-11) 3 commits\n   (merged to 'next' on 2010-01-03 at ffe77d6)\n  + octopus: remove dead code\n  + octopus: reenable fast-forward merges\n  + octopus: make merge process simpler to follow\n\n * js/filter-branch-prime (2009-12-15) 1 commit\n   (merged to 'next' on 2010-01-03 at 7c90319)\n  + filter-branch: remove an unnecessary use of 'git read-tree'\n"},{"id":"131238","messageId":"fabb9a1e1001101221i389c05a8v7ff241859d5e8dae@mail.gmail.com","threadId":"22156","inReplyTo":"7vmy0lpwes.fsf@alter.siamese.dyndns.org","subject":"Re: \"What's cooking\" incremental edition","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-01-10T20:21:20Z","receivedAt":"2010-01-10T20:21:20Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, Jan 10, 2010 at 14:55, Junio C Hamano <gitster@pobox.com> wrote:\n>  * jn/makefile (2010-01-06) 4 commits\n> - - Makefile: consolidate .FORCE-* targets\n> - - Makefile: learn to generate listings for targets requiring special flags\n> - - Makefile: use target-specific variable to pass flags to cc\n> - - Makefile: regenerate assembler listings when asked\n> +  (merged to 'next' on 2010-01-10 at f5a5d42)\n> + + Makefile: consolidate .FORCE-* targets\n> + + Makefile: learn to generate listings for targets requiring special flags\n> + + Makefile: use target-specific variable to pass flags to cc\n> + + Makefile: regenerate assembler listings when asked\n\nFwiw, I find it harder to read due to the now ambiguous meaning of the\n+ and - (it could either mean something is in pu/next, or that the\ntopic changed). Of course this is partly caused by the fact that I\ndon't read emails in fixed font (by default), but perhaps it's worth\nconsidering using different symbols for pu/next-ness?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"131388","messageId":"20100112162736.GC25092@coredump.intra.peff.net","threadId":"22156","inReplyTo":"fabb9a1e1001101221i389c05a8v7ff241859d5e8dae@mail.gmail.com","subject":"Re: \"What's cooking\" incremental edition","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-01-12T16:27:36Z","receivedAt":"2010-01-12T16:27:36Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Jan 10, 2010 at 03:21:20PM -0500, Sverre Rabbelier wrote:\n\n> On Sun, Jan 10, 2010 at 14:55, Junio C Hamano <gitster@pobox.com> wrote:\n> >  * jn/makefile (2010-01-06) 4 commits\n> > - - Makefile: consolidate .FORCE-* targets\n> > - - Makefile: learn to generate listings for targets requiring special flags\n> > - - Makefile: use target-specific variable to pass flags to cc\n> > - - Makefile: regenerate assembler listings when asked\n> > +  (merged to 'next' on 2010-01-10 at f5a5d42)\n> > + + Makefile: consolidate .FORCE-* targets\n> > + + Makefile: learn to generate listings for targets requiring special flags\n> > + + Makefile: use target-specific variable to pass flags to cc\n> > + + Makefile: regenerate assembler listings when asked\n> \n> Fwiw, I find it harder to read due to the now ambiguous meaning of the\n> + and - (it could either mean something is in pu/next, or that the\n> topic changed). Of course this is partly caused by the fact that I\n> don't read emails in fixed font (by default), but perhaps it's worth\n> considering using different symbols for pu/next-ness?\n\nI agree. Plus line-by-line is not necessarily the most efficient way to\nconvey the information that a single character changed. If the subject\nof the commit didn't change, it would be easier to see soemething like:\n\n  ->+ Makefile: consolidate .FORCE-* targets\n  ->+ Makefile: learn to generate listings for targets requiring special flags\n\netc (where \">\" is supposed to indicate transition, but it's actually\nquite ugly itself).\n\nThat being said, I don't personally see the incremental format as all\nthat useful. If I want to see increments of what's happening, I use git\nitself.  The \"What's Cooking\" message to me is about seeing a survey of\nall topics, even those that haven't changed, with Junio's comments. So\nyou may take my suggestions with a large grain of salt. :)\n\n-Peff\n"}]}