From 55d7037d133cc97a55e02cce84247d4f196b65c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 5 Aug 2008 21:44:16 -0700 Subject: [PATCH] What's cooking (2008/07 #06) --- whats-cooking.txt | 251 +++++++++++++++++++++--------------------------------- 1 file changed, 96 insertions(+), 155 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 9447fce872..39bdfcf754 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,6 +1,6 @@ -Subject: What's cooking in git.git (Jul 2008, issue #05; Sun, 13) +Subject: What's cooking in git.git (Jul 2008, issue #06; Tue, 15) -What's cooking in git.git (Jul 2008, issue #05; Sun, 13) +What's cooking in git.git (Jul 2008, issue #06; Tue, 15) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -10,29 +10,68 @@ in 'next'. The topics list the commits in reverse chronological order. The topics meant to be merged to the maintenance series have "maint-" in their names. -I think most of the important stuff is already in 'next'. Let's start -talking about closing the merge window for 1.6.0. +It so happens that the topics clearly separated between the ones that are +obviously ready for 1.6.0 and the others that aren't yet as of tonight. +It seems that it is a good time to draw that line and tag -rc0 tomorrow, +after merging the remaining topics in 'next'. ---------------------------------------------------------------- [New Topics] +I could apply these directly to master, but I am just playing it safe. + +* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits + + index-pack: Honor core.deltaBaseCacheLimit when resolving deltas + + index-pack: Track the object_entry that creates each base_data + + index-pack: Chain the struct base_data on the stack for traversal + + index-pack: Refactor base arguments of resolve_delta into a struct + +* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit + + git-rebase: report checkout failure + +* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits + + Do not try to detect move/copy for entries below threshold. + + Avoid rescanning unchanged entries in search for copies. + +This gives a drastic performance improvement to "git-blame -C -C" with +quite straightforward and obvious code change. + +* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits + + archive: remove extra arguments parsing code + + archive: unify file attribute handling + + archive: centralize archive entry writing + + archive: add baselen member to struct archiver_args + + add context pointer to read_tree_recursive() + + archive: remove args member from struct archiver + +---------------------------------------------------------------- +[Will merge to master soon] + * sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits - - Make usage strings dash-less - - t/: Use "test_must_fail git" instead of "! git" - - t/test-lib.sh: exit with small negagive int is ok with + + Make usage strings dash-less + + t/: Use "test_must_fail git" instead of "! git" + + t/test-lib.sh: exit with small negagive int is ok with test_must_fail * mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits - - make remove-dashes: apply to scripts and programs as well, not + + make remove-dashes: apply to scripts and programs as well, not just to builtins - - git-bisect: use dash-less form on git bisect log - - t1007-hash-object.sh: use quotes for the test description - - t0001-init.sh: change confusing directory name + + git-bisect: use dash-less form on git bisect log + + t1007-hash-object.sh: use quotes for the test description + + t0001-init.sh: change confusing directory name + +* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits + + git-mailinfo: use strbuf's instead of fixed buffers + + Add some useful functions for strbuf manipulation. + + Make some strbuf_*() struct strbuf arguments const. + +---------------------------------------------------------------- +[Graduated to "master"] * sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit + bash completion: Append space after file names have been completed -Early parts are already merged to 'master' and need to be merged down to +Early parts were already merged to 'master' and need to be merged down to maint as well, as this is about a "performance bug" that has been with us almost forever. @@ -53,45 +92,17 @@ almost forever. + rerere: Separate libgit and builtin functions + builtin-rerere: more carefully find conflict markers -* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits - - git-mailinfo: use strbuf's instead of fixed buffers - - Add some useful functions for strbuf manipulation. - - Make some strbuf_*() struct strbuf arguments const. - -* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit - - cherry: cache patch-ids to avoid repeating work - -This does not seem to pass tests even on its own. - * js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit + Add pretty format %aN which gives the author name, respecting .mailmap -* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 6 commits - - Allow add_path() to add non-existent directories to the path - - Allow the built-in exec path to be relative to the command - invocation path - - Fix relative built-in paths to be relative to the command - invocation +* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits + help (Windows): Display HTML in default browser using Windows' shell API + help.c: Add support for htmldir relative to git_exec_path() + Move code interpreting path relative to exec-dir to new function system_path() -The earlier parts are obvious; Dscho seemed to have some comments on the -later ones that are in 'pu'. - -* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits - - gitweb: use new Git::Repo API, and add optional caching - - Add new Git::Repo API - - gitweb: add test suite with Test::WWW::Mechanize::CGI - -This does not pass t9710, at least for me X-<. - ----------------------------------------------------------------- -[Will merge to master soon] - * jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits + Documentation: mention ORIG_HEAD in am, merge, and rebase + Teach "am" and "rebase" to mark the original position with @@ -102,9 +113,6 @@ This does not pass t9710, at least for me X-<. + branch --contains: default to HEAD + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag -This builds on top of the parse-options enhancement series that -has been cooking in 'next' for some time. - * om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit + builtin-rerere: more carefully find conflict markers @@ -112,17 +120,33 @@ has been cooking in 'next' for some time. + git-mailinfo: Fix getting the subject from the in-body [PATCH] line ----------------------------------------------------------------- -[Actively Cooking] - -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits - + Teach git-merge -X