Update whatsin and whatscooking

index 0620c89513..f558c748d7 100644 --- a/whatscooking.txt +++ b/whatscooking.txt @@ -1,4 +1,4 @@ -What's cooking in git.git (Jul 2008, issue #09; Sun, 20) +What's cooking in git.git (Jul 2008, issue #10; Sat, 26) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -17,15 +17,31 @@ to do without regression. Tentative schedule, my wishful thinking: - - 1.6.0-rc0 (Jul 20) - - 1.6.0-rc1 (Jul 23) - - 1.6.0-rc2 (Jul 30) - - 1.6.0-rc3 (Aug 6) - - 1.6.0 (Aug 10) + - 1.6.0-rc1 (Jul 27) + - 1.6.0-rc2 (Aug 6) + - 1.6.0-rc3 (Aug 10) ---------------------------------------------------------------- [New Topics] +* cc/bisect (Tue Jul 22 08:16:18 2008 +0200) 2 commits + . bisect: only check merge bases when needed + . bisect: test merge base if good rev is not an ancestor of bad rev + +* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits + + builtin-add.c: optimize -A option and "git add ." + + builtin-add.c: restructure the code for maintainability + +* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits + + spawn pager via run_command interface + + run-command: add pre-exec callback + +* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit + + Enable threaded delta search on *BSD and Linux. + +---------------------------------------------------------------- +[Cooking] + * pb/sane-mv (Mon Jul 21 02:25:56 2008 +0200) 2 commits - git-mv: Keep moved index entries inact - git-mv: Remove dead code branch @@ -35,139 +51,19 @@ it while moving it to B, which was a longstanding nonsense. This attempts to fix it. Pasky has other plans to build on a more solidified foundation to enhance the command to work with submodules better on top of this. ----------------------------------------------------------------- -[Graduated to "master"] - -* 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 - -This one is for Ingo. - -This changes the message rerere issues after reusing previous conflict -resolution from "Resolved" to "Staged" when autoupdate option is in -effect. - -It is envisioned that in practice, some auto resolutions are trickier and -iffier than others, and we would want to add a feature to mark individual -resolutions as "this is ok to autoupdate" or "do not autoupdate the result -using this resolution even when rerere.autoupdate is in effect" in the -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 - -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits - + Teach git-merge -X<option> again. - + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next - + builtin-merge.c: use parse_options_step() "incremental parsing" - machinery - + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next - -* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits - - Document that merge strategies can now take their own options - + Make "subtree" part more orthogonal to the rest of merge- - recursive. - + Teach git-pull to pass -X<option> to git-merge - + Teach git-merge to pass -X<option> to the backend strategy module - + git-merge-recursive-{ours,theirs} - + git-merge-file --ours, --theirs - -It appears nobody wants "theirs" nor "ours", so I'll soon apply a -wholesale revert for these series to 'next', and then these will be -dropped when we rewind 'next' after 1.6.0 final. - -Please make sure next time somebody asks "ours/theirs" merge on the list -and #git s/he is quickly told that it was unanimously rejected so that -people do not have to waste time rehashing the topic ever again. - ----------------------------------------------------------------- -[Stalled/Needs more work] +I think this is of 'next' quality already. * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits - - Documentation: Improve documentation for git-imap-send(1) - - imap-send.c: more style fixes - - imap-send.c: style fixes - - git-imap-send: Support SSL - - git-imap-send: Allow the program to be run from subdirectories of + + Documentation: Improve documentation for git-imap-send(1) + + imap-send.c: more style fixes + + imap-send.c: style fixes + + git-imap-send: Support SSL + + git-imap-send: Allow the program to be run from subdirectories of a git tree -I said: "Some people seem to prefer having this feature available also -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? - -* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit - . cherry: cache patch-ids to avoid repeating work - -The discussion suggested that the value of having the cache itself is -iffy, but I should pick up the updated one and look at it. - -* 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 - -* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits - . Migrate git-am to use git-sequencer - . Add git-sequencer test suite (t3350) - . Add git-sequencer prototype documentation - . Add git-sequencer shell prototype - -I haven't looked at the updated series yet. I should, but nobody else -seems to be looking at these patches, which is somewhat depressing but -understandable. Summer is slower ;-) - -* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit - - [BROKEN wrt shallow clones] Ignore graft during object transfer - -Cloning or fetching from a repository from grafts did not send objects -that are hidden by grafts, but the commits in the resulting repository do -need these to pass fsck. This fixes object transfer to ignore grafts. - -Another fix is needed to git-prune so that it ignores grafts but treats -commits that are mentioned in grafts as reachable. - -* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits - - blame: show "previous" information in --porcelain/--incremental - format - - git-blame: refactor code to emit "porcelain format" output - -This is for peeling the line from the blamed version to see what's behind -it, which may or may not help applications like gitweb. - ----------------------------------------------------------------- -[Dropped] - -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits - + Teach git-merge -X<option> again. - + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next - + builtin-merge.c: use parse_options_step() "incremental parsing" - machinery - + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next - -* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits - - Document that merge strategies can now take their own options - + Make "subtree" part more orthogonal to the rest of merge- - recursive. - + Teach git-pull to pass -X<option> to git-merge - + Teach git-merge to pass -X<option> to the backend strategy module - + git-merge-recursive-{ours,theirs} - + git-merge-file --ours, --theirs - -It appears nobody wants "theirs" nor "ours", so I'll soon apply a -wholesale revert for these series to 'next', and then these will be -dropped when we rewind 'next' after 1.6.0 final. - -Please make sure next time somebody asks "ours/theirs" merge on the list -and #git s/he is quickly told that it was unanimously rejected so that -people do not have to waste time rehashing the topic ever again. +Some people seem to prefer having this feature available also with gnutls. +Such an enhancement can be done in-tree on top of this series if they are +so inclined. ---------------------------------------------------------------- [On Hold] @@ -190,9 +86,22 @@ This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0 timeframe. * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit - - diff: enable "too large a rename" warning when -M/-C is explicitly + . diff: enable "too large a rename" warning when -M/-C is explicitly asked for This would be the right thing to do for command line use, but gitk will be hit due to tcl/tk's limitation, so I am holding this back for now. +---------------------------------------------------------------- +[Dropped] + +There are a handful topics that used to be in 'pu' but tentatively dropped +for now. + +*^ cc/bisect (Tue Jul 22 08:16:18 2008 +0200) 2 commits +*^ gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit +*^ jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit +*^ sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits + +I still hold onto their tips and intend to update them with newer versions +and/or merge them back to 'pu' when I have time, but not right now.

index acdda3d878..b2ffa51d6d 100644 --- a/whatsin.txt +++ b/whatsin.txt @@ -1,51 +1,147 @@ -What's in git.git (Jul 2008, issue #07; Sun, 20) +What's in git.git (Jul 2008, issue #08; Sat, 26) - maint 2d9c572 (fix usage string for git grep, 2008-07-20) - master 93310a4 (Merge branch 'ap/trackinfo', 2008-07-20) + maint bfce508 (Makefile: fix shell quoting, 2008-07-25) + master b0320ea (git-reset: Let -q hush "locally modified" messages, 2008-07-25) ------------------------------------------------------------------------ -As announced in a separate message, the tip of master was tagged as -1.6.0-rc0; for people who neglected futureproofing themselves so far, it -would really be a good time to seriously consider doing so. +There are quite a bunch of changes to 'master' but they are mostly fix-ups +to the new codepaths introduced recently; iow, exactly the kind of patches +we would want to see before and during the -rc period. * The 'maint' branch has these fixes since the last announcement. -Jonathan Nieder (1): - fix usage string for git grep +Björn Steinbrink (1): + index-pack.c: correctly initialize appended objects -Junio C Hamano (1): - refresh-index: fix bitmask assignment +Junio C Hamano (2): + tests: propagate $(TAR) down from the toplevel Makefile + Makefile: fix shell quoting + +Peter Valdemar Mørch (1): + send-email: find body-encoding correctly + +Pierre Habouzit (1): + git-checkout: fix command line parsing. * The 'master' branch has these since the last announcement in addition to the above. -Avery Pennarun (1): - Reword "your branch has diverged..." lines to reduce line length +Alex Riesen (1): + Allow pager of diff command be enabled/disabled + +Brad King (1): + git-svn: teach dcommit about svn auto-props + +Brandon Casey (7): + t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old + diff + t4116-apply-reverse.sh: use $TAR rather than tar + t3200,t7201: replace '!' with test_must_fail + t7502-commit.sh: rearrange test to make more portable + t/t4202-log.sh: add newline at end of file + Teach fsck and prune about the new location of temporary objects + perl/Makefile: update NO_PERL_MAKEMAKER section + +Daniel Barkalow (1): + In perforce, RCS keywords are case-sensitive + +Johannes Schindelin (8): + Rename .git/rebase to .git/rebase-apply + Rename path_list to string_list + Fix two leftovers from path_list->string_list + Ignore dirty submodule states in "git pull --rebase" + Add test to show that show-branch misses out the 8th column + sort_in_topological_order(): avoid setting a commit flag + builtin-commit: Two trivial style-cleanups + git daemon: avoid waking up too often + +Johannes Sixt (10): + rebase -i: When an 'edit' stops, mention the commit + Makefile: Do not install a copy of 'git' in $(gitexecdir) + Makefile: Normalize $(bindir) and $(gitexecdir) before comparing + Record the command invocation path early + Fix relative built-in paths to be relative to the command invocation + Allow the built-in exec path to be relative to the command invocation + path + Allow add_path() to add non-existent directories to the path + Windows: Make $(gitexecdir) relative + Windows: Make sure argv[0] has a path + Windows: Do not compile git-shell + +Jonathan Nieder (2): + git-diff(1): "--c" -> "--cc" typo fix + document that git-tag can tag more than heads + +Junio C Hamano (9): + Update my e-mail address + Revert "make git-status use a pager" + tests: do not rely on external "patch" + stash save: fix parameter handling + builtin-branch.c: remove unused code in append_ref() callback function + builtin-branch.c: optimize --merged and --no-merged + Documentation: clarify diff --cc + ignore non-existent refs in dwim_log() + Documentation: clarify how to disable elements in core.whitespace + +Lee Marlow (1): + bash completion: Add long options for 'git rm' + +Miklos Vajna (2): + builtin-merge: give a proper error message for invalid strategies in + config + t7601: extend the 'merge picks up the best result' test + +Nikolaj Schumacher (1): + Don't cut off last character of commit descriptions. + +Olivier Marin (4): + git-am: remove dash from help message + parse-options: fix segmentation fault when a required value is missing + git am --skip: clean the index while preserving local changes + update test case to protect am --skip behaviour + +P. Christeas (1): + svnimport: newer libsvn wants us to ask for the root with "", not "/" + +Petr Baudis (2): + git-filter-branch.sh: Allow running in bare repositories + Documentation/git-filter-branch: teach "rm" instead of "update-index + --remove" + +Philippe Bruhat (1): + mailinfo: better parse email adresses containg parentheses -Dmitry Potapov (1): - git-svn: fix git svn info to work without arguments +Pierre Habouzit (3): + builtin-merge: add missing structure initialization + git-submodule: move ill placed shift. + git-checkout: improve error messages, detect ambiguities. -Junio C Hamano (8): - rerere.autoupdate: change the message when autoupdate is in effect - builtin-add.c: restructure the code for maintainability - git-add --all: add all files - git-add --all: tests - git-add --all: documentation - Link shell with compat layer functions - Move read_in_full() and write_in_full() to wrapper.c - "needs update" considered harmful +René Scharfe (5): + archive: add write_archive() + archive: move parameter parsing code to archive.c + archive: define MAX_ARGS where it's needed + archive: declare struct archiver where it's needed + archive: allow --exec and --remote without equal sign -Lars Noschinski (1): - cvsserver: Add testsuite for packed refs +SZEDER Gábor (2): + checkout: mention '--' in the docs + bash: offer only paths after '--' for 'git checkout' -Michele Ballabio (2): - builtin-merge.c: Fix option parsing - builtin-push.c: Cleanup - use OPT_BIT() and remove some variables +Stephan Beyer (7): + git-am: Add colon before the subject that is printed out as being applied + am --abort: Add to bash-completion and mention in git-rerere + documentation + Make non-static functions, that may be static, static + Move launch_editor() from builtin-tag.c to editor.c + editor.c: Libify launch_editor() + git-am: Mention --abort in usage string part of OPTIONS_SPEC + git-reset: Let -q hush "locally modified" messages -Miklos Vajna (1): - Teach 'git merge' that some merge strategies no longer exist +Steve Haslam (2): + Propagate -u/--upload-pack option of "git clone" to transport. + Remove references to git-fetch-pack from "git clone" documentation. -Nanako Shiraishi (1): - git am --abort +Thomas Rast (1): + git-completion.bash: provide completion for 'show-branch'