{"thread":{"id":"15954","subject":"What's cooking in git.git (Oct 2008, #04; Sat, 18)","startedAt":"2008-10-18T20:36:14Z","lastAt":"2008-10-19T15:18:33Z","messageCount":3,"participants":["Junio C Hamano","Thomas Rast","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"93388","messageId":"7viqrpabep.fsf@gitster.siamese.dyndns.org","threadId":"15954","inReplyTo":null,"subject":"What's cooking in git.git (Oct 2008, #04; Sat, 18)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-18T20:36:14Z","receivedAt":"2008-10-18T20:36:14Z","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\n----------------------------------------------------------------\n[New Topics]\n\n* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit\n + Fix reading of cloud tags\n\n* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits\n + make alloc_ref_from_str() the new alloc_ref()\n + use alloc_ref_from_str() everywhere\n + add alloc_ref_with_prefix()\n\n* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit\n - reset --hard/read-tree --reset -u: remove unmerged new paths\n\n* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits\n + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other\n + refactor handling of \"other\" files in ls-files and status\n\n* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits\n - Fix checkout not to clobber the branch when using symlinked HEAD\n   upon detaching\n - Enhance hold_lock_file_for_{update,append}() API\n - demonstrate breakage of detached checkout with symbolic link HEAD\n - Fix \"checkout --track -b newbranch\" on detached HEAD\n\n* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit\n + refactor handling of \"other\" files in ls-files and status\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\n* np/index-pack (Fri Oct 17 15:57:58 2008 -0400) 2 commits\n + index-pack: smarter memory usage during delta resolution\n + index-pack: rationalize delta resolution code\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\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\n----------------------------------------------------------------\n[Needs review]\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----------------------------------------------------------------\n[Dropped]\n\n* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit\n . t7400: Add short \"git submodule add\" testsuite\n\nWas waiting for a reroll.\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[Stalled]\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.\nWaiting for a reroll.\n\n----------------------------------------------------------------\n[Will be merged to 'master' soon]\n\n* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits\n + pull: allow \"git pull origin $something:$current_branch\" into an\n   unborn branch\n + Fix fetch/pull when run without --update-head-ok\n\n* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits\n + rebase: Document --no-verify option to bypass pre-rebase hook\n + rebase --no-verify\n\nThis adds --no-verify to git rebase, to avoid the pre-rebase hook.\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* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit\n + Do not rename read-only files during a push\n\nFixes pack file renames on Windows.\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 (Thu Oct 2 16:55:39 2008 -0400) 1 commit\n + format-patch: autonumber by default\n\n* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits\n + git-check-attr(1): use 'verse' for multi-line synopsis sections\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* 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\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----------------------------------------------------------------\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\nExpecting an update.\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\n* sh/rebase-i-p (Wed Oct 15 02:44:40 2008 -0500) 8 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 + rebase--interactive: fix parent rewriting for dropped commits\n\nChanges the `rebase -i -p` behavior to behave like git sequencer's\nrewrite of `rebase -i` would behave.\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.\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/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":"93434","messageId":"20081019120124.GA1457@coredump.intra.peff.net","threadId":"15954","inReplyTo":"7viqrpabep.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #04; Sat, 18)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-10-19T12:01:24Z","receivedAt":"2008-10-19T12:01:24Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Oct 18, 2008 at 01:36:14PM -0700, Junio C Hamano wrote:\n\n> ----------------------------------------------------------------\n> [Actively Cooking]\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.\n\nHmm, I was planning on re-rolling this before it hit next to deal with\nthe issues brought up about the binary option, but I guess it is too\nlate now (yes, I was being slow about it...). I think I can salvage it\nwith some patches on top, though.\n\n-Peff\n"},{"id":"93421","messageId":"200810191718.38614.trast@student.ethz.ch","threadId":"15954","inReplyTo":"7viqrpabep.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Oct 2008, #04; Sat, 18)","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2008-10-19T15:18:33Z","receivedAt":"2008-10-19T15:18:33Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Junio C Hamano 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> Expecting an update.\n\nNote that the branch name is somewhat misleading; my fault for causing\nconfusion by grouping these two together with the gitworkflows.txt\nRFCs.  The two topics are independent.\n\nAnd needless to say, I also managed to confuse myself.  The above two\nare already the final version.  As far as I can tell, you've also made\ntwo small corrections of your own; much appreciated.\n\nI'll send an updated version of the gitworkflows.txt draft shortly,\nwhich is what I meant in my last mail.\n\n- Thomas\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n\n"}]}