From f9b24f2ce2af3c7e30479fc3c00e7b7a264c3bb7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 20 Jul 2008 22:59:00 -0700 Subject: [PATCH] What's cooking in git.git (Jul 2008, issue #08; Sat, 19) --- whatscooking.txt | 219 +++++++++++++++++++++---------------------------------- 1 file changed, 83 insertions(+), 136 deletions(-) diff --git a/whatscooking.txt b/whatscooking.txt index 5f0e2f25dd..6b8d02b721 100644 --- a/whatscooking.txt +++ b/whatscooking.txt @@ -1,4 +1,4 @@ -What's cooking in git.git (Jul 2008, issue #07; Thu, 17) +What's cooking in git.git (Jul 2008, issue #08; Sat, 19) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -8,10 +8,6 @@ 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. -Right now 'next' is very thin. After today's new topics, perhaps except -for the submodule stuff by Pasky, are merged to 'master', we will have the -1.6.0-rc0, and from there the usual pre-release freeze begins. - Due to increased activity level from people including GSoC students, I expect 'next' to stay somewhat more active than previous rounds during the 1.6.0-rc cycle. The request for people who usually follow 'next' is the @@ -27,11 +23,20 @@ Tentative schedule, my wishful thinking: - 1.6.0-rc3 (Aug 6) - 1.6.0 (Aug 10) +No real activity on 'next', as I was busy tending bugfixes and pushing out +v1.5.6.4 today. + ---------------------------------------------------------------- -[New Topics] +[Will merge to "master" soon] + +* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit + + git am --abort + +This one is for Ted; builds on top of the recent "am and rebase leaves +ORIG_HEAD just like reset, merge and pull does" rather nicely. * jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit - - rerere.autoupdate: change the message when autoupdate is in effect + + rerere.autoupdate: change the message when autoupdate is in effect This one is for Ingo. @@ -47,86 +52,10 @@ future. When that happens, these messages will make the distinction clearer. * ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit - - Reword "your branch has diverged..." lines to reduce line length - -You saw the exchange on the list. Queued is my "make it shorter and make -sure variable parts are closer to left edge of the screen" version but -better alternatives are welcome. I suspect not many people would care too -much about details, as long as the message fits and does not waste screen -real estate. - -* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit - - git am --abort - -This one is for Ted; builds on top of the recent "am and rebase leaves -ORIG_HEAD just like reset, merge and pull does" rather nicely. - -* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits - - t7403: Submodule git mv, git rm testsuite - - git rm: Support for removing submodules - - git mv: Support moving submodules - - submodule.*: Introduce simple C interface for submodule lookup by - path - - git submodule add: Fix naming clash handling - - t7400: Add short "git submodule add" testsuite - - git-mv: Remove dead code branch - -Long overdue usability improvement series for submodule. Very much -welcomed. It would be nice to have some submodule improvements in 1.6.0. -Realistically speaking, however, I predict that it would take us a few -more rounds to hit 'next' with this, and it will not be in 'master' when -1.6.0 ships. + + Reword "your branch has diverged..." lines to reduce line length ---------------------------------------------------------------- -[Graduated to "master"] - -* 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 - -* 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 - 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 - 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 - -* 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. - -This actually had a tiny regression I did not discover until I merged it -to 'master', where a fixup has already been applied. - ----------------------------------------------------------------- -[On Hold] +[Stalled/Needs more work] * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits - Documentation: Improve documentation for git-imap-send(1) @@ -141,57 +70,6 @@ with gnutls. If such a patch materializes soon, that would be good, but otherwise I'll merge this as-is to 'next'. Such an enhancement can be done in-tree on top of this series." Anybody? -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits - + Teach git-merge -X