From 84ccf7d2270cd52a6433700388ffde352767b8be Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 31 Jul 2008 16:50:43 -0700 Subject: [PATCH] Last WI/WC for Jul 2008 --- whatscooking.txt | 89 ++++++++++---------- whatsin.txt | 214 ++++++++++++++++++++--------------------------- 2 files changed, 140 insertions(+), 163 deletions(-) diff --git a/whatscooking.txt b/whatscooking.txt index f558c748d7..db68e5351c 100644 --- a/whatscooking.txt +++ b/whatscooking.txt @@ -1,5 +1,5 @@ -What's cooking in git.git (Jul 2008, issue #10; Sat, 26) --------------------------------------------------------- +What's cooking in git.git (Jul 2008, #11; Thu, 31) +-------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are @@ -17,41 +17,44 @@ to do without regression. Tentative schedule, my wishful thinking: - - 1.6.0-rc1 (Jul 27) - - 1.6.0-rc2 (Aug 6) + - 1.6.0-rc2 (Aug 3) - 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 +* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit + + archive: allow --exec and --remote without equal sign -* 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 +None of the following is for 1.6.0. -* 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 +* mv/merge-custom (Thu Jul 31 00:38:07 2008 +0200) 5 commits + + builtin-help: always load_command_list() in cmd_help() + + Add a second testcase for handling invalid strategies in git-merge + + Add a new test for using a custom merge strategy + + builtin-merge: allow using a custom strategy + + builtin-help: make some internal functions available to other + builtins -* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit - + Enable threaded delta search on *BSD and Linux. +* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits + - git-merge-octopus: use (merge-base A (merge B C D E...)) for + stepwise merge + + merge-base-many: add trivial tests based on the documentation + + documentation: merge-base: explain "git merge-base" with more than + 2 args + + merge-base: teach "git merge-base" to drive underlying + merge_bases_many() + +* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit + . revision traversal: show full history with merge simplification + +"log --full-history" is with too much clutter, "log" itself is too cleverer +than some people, and here is the middle level of merge simplification. ---------------------------------------------------------------- -[Cooking] +[On Hold and/or 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 - -Running "git mv A B" when you have local changes to A automatically staged -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. - -I think this is of 'next' quality already. +None of the following is for 1.6.0. * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits + Documentation: Improve documentation for git-imap-send(1) @@ -65,8 +68,24 @@ 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] +* cc/bisect (Fri Jul 25 05:36:37 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 + +This changes the parent-child relationship between the pager and the git +process. We used to make pager the parent which meant that the exit +status from git is lost from the caller. + +* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit + + Enable threaded delta search on *BSD and Linux. * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit + merge: remove deprecated summary and diffstat options and config @@ -91,17 +110,3 @@ timeframe. 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. diff --git a/whatsin.txt b/whatsin.txt index b2ffa51d6d..96fafedc83 100644 --- a/whatsin.txt +++ b/whatsin.txt @@ -1,147 +1,119 @@ -What's in git.git (Jul 2008, issue #08; Sat, 26) +What's in git.git (Jul 2008, #09; Thu, 31) maint bfce508 (Makefile: fix shell quoting, 2008-07-25) - master b0320ea (git-reset: Let -q hush "locally modified" messages, 2008-07-25) + master 0fe8c13 (Allow "non-option" revision options in parse_option-enabled commands, 2008-07-31) ------------------------------------------------------------------------ -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. +Some git-gui updates for 1.6.0 are included, and then many minor fixes. +Perhaps -rc2 this weekend. -* The 'maint' branch has these fixes since the last announcement. +* The 'master' branch has these since the last announcement. -Björn Steinbrink (1): - index-pack.c: correctly initialize appended objects - -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. +Abhijit Menon-Sen (5): + git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core + Clarify that "git log x.c y.h" lists commits that touch either file + `git submodule add` now requires a + Make it clear that push can take multiple refspecs + Make the DESCRIPTION match ... items in the SYNOPSIS Alex Riesen (1): - Allow pager of diff command be enabled/disabled + Make use of stat.ctime configurable -Brad King (1): - git-svn: teach dcommit about svn auto-props +Alexander Gavrilov (7): + Fix pre-commit hooks under MinGW/MSYS + Add options to control the search for copies in blame. + Kill the blame back-end on window close. + Add a menu item to invoke full copy detection in blame. + git-gui: Fix the Remote menu separator. + git-gui: Preserve scroll position on reshow_diff. + Support copy and rename detection in fast-export. -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 +Anders Melchiorsen (2): + Documentation: fix diff.external example + Advertise the ability to abort a commit -Daniel Barkalow (1): - In perforce, RCS keywords are case-sensitive +Björn Steinbrink (1): + rev-parse: Add support for the ^! and ^@ syntax -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 +Brian Gernhardt (1): + Documentation: Remove mentions of git-svnimport. -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 +Cesar Eduardo Barros (2): + Documentation/git-submodule.txt: fix doubled word + Documentation/git-rev-parse.txt: update for new git-describe output + format -Jonathan Nieder (2): - git-diff(1): "--c" -> "--cc" typo fix - document that git-tag can tag more than heads +Christian Couder (2): + merge-base: die with an error message if not passed a commit ref + documentation: user-manual: update "using-bisect" section -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 +Jakub Narebski (1): + gitweb: More about how gitweb gets 'owner' of repository + +Jeff King (2): + init: handle empty "template" parameter + Compact commit template message + +Johannes Schindelin (1): + Avoid chdir() in list_commands_in_dir() + +Johannes Sixt (2): + git-gui: Fix "Stage/Unstage Line" with one line of context. + git-gui: "Stage Line": Treat independent changes in adjacent lines better + +Jonathan Nieder (1): + t6030 (bisect): work around Mac OS X "ls" + +Junio C Hamano (11): + make sure parsed wildcard refspec ends with slash + GIT 1.6.0-rc1 + Allow building without any git installed + Allow installing in the traditional way + ls-tree documentation: enhance notes on subdirectory and pathspec + behaviour + Documentation: clarify what is shown in "git-ls-files -s" output + t7001: fix "git mv" test + Teach gitlinks to ie_modified() and ce_modified_check_fs() + Fix merge name generation in "merge in C" + Fix test-parse-options "integer" test + Teach --find-copies-harder to "git blame" + +Kevin Ballard (1): + format-patch: Produce better output with --inline or --attach + +Lars Hjemli (3): + builtin-branch: remove duplicated code + builtin-branch: factor out merge_filter matching + builtin-branch: fix -v for --[no-]merged Lee Marlow (1): - bash completion: Add long options for 'git rm' + bash completion: Add completion for 'git help' -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 "/" +Olivier Marin (1): + builtin-verify-tag: fix -v option parsing Petr Baudis (2): - git-filter-branch.sh: Allow running in bare repositories - Documentation/git-filter-branch: teach "rm" instead of "update-index - --remove" + git-mv: Remove dead code branch + git-mv: Keep moved index entries inact -Philippe Bruhat (1): - mailinfo: better parse email adresses containg parentheses +Pierre Habouzit (1): + Allow "non-option" revision options in parse_option-enabled commands -Pierre Habouzit (3): - builtin-merge: add missing structure initialization - git-submodule: move ill placed shift. - git-checkout: improve error messages, detect ambiguities. +Shawn O. Pearce (3): + git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk + fsck: Don't require tmp_obj_ file names are 14 bytes in length + git-gui: Fix gitk search in $PATH to work on Windows -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 - -SZEDER Gábor (2): - checkout: mention '--' in the docs - bash: offer only paths after '--' for 'git checkout' - -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 - -Steve Haslam (2): - Propagate -u/--upload-pack option of "git clone" to transport. - Remove references to git-fetch-pack from "git clone" documentation. +Steffen Prohaska (5): + Refactor, adding prepare_git_cmd(const char **argv) + run-command (Windows): Run dashless "git " + git-gui: Correct installation of library to be $prefix/share + git-gui (Windows): Switch to relative discovery of oguilib + git-gui (Windows): Change wrapper to execdir 'libexec/git-core' Thomas Rast (1): - git-completion.bash: provide completion for 'show-branch' + bash completion: Add long options for 'git describe' + +Todd Zullinger (1): + Replace uses of "git-var" with "git var"