From af0218904f7acc414ecacc39369fb47a26072a8d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Oct 2008 22:37:35 -0700 Subject: [PATCH] What's cooking (2008/10 #05) --- whats-cooking.txt | 188 +++++++++++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 87 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 78e0fade69..8f2ca31744 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,8 +1,8 @@ -Subject: What's cooking in git.git (Oct 2008, #04; Sat, 18) -X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344 -X-next-at: 8f0e41f379d486dd27766d84d994eb1da5b8319d +Subject: What's cooking in git.git (Oct 2008, #05; Wed, 22) +X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0 +X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8 -What's cooking in git.git (Oct 2008, #04; Sat, 18) +What's cooking in git.git (Oct 2008, #05; Wed, 22) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -15,8 +15,34 @@ meant to be merged to the maintenance series have "maint-" in their names. ---------------------------------------------------------------- [New Topics] -* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit - + Fix reading of cloud tags +* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit + + Git.pm: do not break inheritance + +Looked Ok; will be in 'master' soon. + +* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits + - gitweb: generate parent..current URLs + - gitweb: parse parent..current syntax from PATH_INFO + - gitweb: use_pathinfo filenames start with / + - gitweb: generate project/action/hash URLs + - gitweb: parse project/action/hash_base:filename PATH_INFO + +Seventh iteration; hopefully the usual gitweb gangs will give quick +comments and ack to push this out to 'next' soon. + +* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit + + builtin-blame: Reencode commit messages according to git-log + rules. + +Looked Ok; will be in 'master' soon. + +* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit + + parse-opt: migrate builtin-checkout-index. + +Looked Ok; will be in 'master' soon. + +---------------------------------------------------------------- +[Graduated to "master"] * rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits + make alloc_ref_from_str() the new alloc_ref() @@ -24,85 +50,30 @@ meant to be merged to the maintenance series have "maint-" in their names. + add alloc_ref_with_prefix() * jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit - - reset --hard/read-tree --reset -u: remove unmerged new paths + + reset --hard/read-tree --reset -u: remove unmerged new paths + +Teaches "reset --hard" to remove new paths in conflict. * jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other + refactor handling of "other" files in ls-files and status * jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits - - Fix checkout not to clobber the branch when using symlinked HEAD + + Fix checkout not to clobber the branch when using symlinked HEAD upon detaching - - Enhance hold_lock_file_for_{update,append}() API - - demonstrate breakage of detached checkout with symbolic link HEAD - - Fix "checkout --track -b newbranch" on detached HEAD + + Enhance hold_lock_file_for_{update,append}() API + + demonstrate breakage of detached checkout with symbolic link HEAD + + Fix "checkout --track -b newbranch" on detached HEAD * jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit + refactor handling of "other" files in ls-files and status -* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit - + merge: remove deprecated summary and diffstat options and config - variables - -* np/index-pack (Fri Oct 17 15:57:58 2008 -0400) 2 commits - + index-pack: smarter memory usage during delta resolution - + index-pack: rationalize delta resolution code - ----------------------------------------------------------------- -[Graduated to "master"] - * pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits + tutorial: update output of git commit + reformat informational commit message + git commit: Reformat output somewhat + builtin-commit.c: show on which branch a commit was added ----------------------------------------------------------------- -[Needs review] - -* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits - - grep: skip files outside sparse checkout area - - checkout_entry(): CE_NO_CHECKOUT on checked out entries. - - Prevent diff machinery from examining worktree outside sparse - checkout - - ls-files: Add tests for --sparse and friends - - update-index: add --checkout/--no-checkout to update - CE_NO_CHECKOUT bit - - update-index: refactor mark_valid() in preparation for new options - - ls-files: add options to support sparse checkout - - Introduce CE_NO_CHECKOUT bit - - Extend index to save more flags - ----------------------------------------------------------------- -[Dropped] - -* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit - . t7400: Add short "git submodule add" testsuite - -Was waiting for a reroll. - -* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit - . git-am: Pass the --directory option through to git-apply - -I think this is still buggy and drops the option when am stops with -conflicts. - ----------------------------------------------------------------- -[Stalled] - -* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits - - Use xdiff caching to improve git blame performance - - Allow xdiff machinery to cache hash results for a file - - Always initialize xpparam_t to 0 - - Bypass textual patch generation and parsing in git blame - - Allow alternate "low-level" emit function from xdl_diff - -Réne had good comments on how the callback should be structured. -Waiting for a reroll. - ----------------------------------------------------------------- -[Will be merged to 'master' soon] - * js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits + pull: allow "git pull origin $something:$current_branch" into an unborn branch @@ -160,33 +131,15 @@ depend upon this initial cleanup work. Does what it says it does. This may be ready for master soon, its a pretty trivial change. ----------------------------------------------------------------- -[Actively Cooking] - * tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits + Documentation: Refer to git-rebase(1) to warn against rewriting + Documentation: new upstream rebase recovery section in git-rebase -Expecting an update. +Also the workflow document itself is now in 'master'. * sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit + rebase--interactive: fix parent rewriting for dropped commits -* sh/rebase-i-p (Wed Oct 15 02:44:40 2008 -0500) 8 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 - + rebase--interactive: fix parent rewriting for dropped commits - -Changes the `rebase -i -p` behavior to behave like git sequencer's -rewrite of `rebase -i` would behave. - * jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits + diff: add filter for converting binary to text + diff: introduce diff..binary @@ -197,11 +150,72 @@ 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. +---------------------------------------------------------------- +[Stalled] + +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits + - grep: skip files outside sparse checkout area + - checkout_entry(): CE_NO_CHECKOUT on checked out entries. + - Prevent diff machinery from examining worktree outside sparse + checkout + - ls-files: Add tests for --sparse and friends + - update-index: add --checkout/--no-checkout to update + CE_NO_CHECKOUT bit + - update-index: refactor mark_valid() in preparation for new options + - ls-files: add options to support sparse checkout + - Introduce CE_NO_CHECKOUT bit + - Extend index to save more flags + +Needs review. + +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits + - Use xdiff caching to improve git blame performance + - Allow xdiff machinery to cache hash results for a file + - Always initialize xpparam_t to 0 + - Bypass textual patch generation and parsing in git blame + - Allow alternate "low-level" emit function from xdl_diff + +Réne had good comments on how the callback should be structured. +Waiting for a reroll. + * jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit - gitweb: Better processing format string in custom links in navbar Waiting for some sort of response from Pasky. +* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit + + Fix reading of cloud tags + +Request-for-review-and-ack sent; waiting for response. + +---------------------------------------------------------------- +[Actively Cooking] + +* np/index-pack (Wed Oct 22 20:59:22 2008 -0400) 4 commits + - improve index-pack tests + + fix multiple issues in index-pack + + index-pack: smarter memory usage during delta resolution + + index-pack: rationalize delta resolution code + +The buglets that caused people on 'next' some surprises are quickly +killed. Thanks. + +* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits + + git-rebase--interactive.sh: comparision with == is bashism + + rebase-i-p: minimum fix to obvious issues + + 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 + +Changes the `rebase -i -p` behavior to behave like git sequencer's +rewrite of `rebase -i` would behave. + ---------------------------------------------------------------- [On Hold] -- 2.11.4.GIT