What's cooking (2008/08 #03)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 394b44a983e5544f44facd375d1ac94a5a28af17..d3cf4967adae171f1883fe8dc81f229783557071 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,8 +1,8 @@
-Subject: What's cooking in git.git (Aug 2008, #02; Mon, 11)
-X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6
-X-next-at: 3cb9d94cdc74f3137599446af9f5442b7ae1ab27
+Subject: What's cooking in git.git (Aug 2008, #03; Thu, 14)
+X-master-at: a0653d550524a0263d36fde6a8cf98941dd057ab
+X-next-at: 8dd0c03fb2b8807ef71d5e807e65818dbd05a118
 
-What's cooking in git.git (Aug 2008, #02; Mon, 11)
+What's cooking in git.git (Aug 2008, #03; Thu, 14)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed
@@ -15,6 +15,74 @@ meant to be merged to the maintenance series have "maint-" in their names.
 ----------------------------------------------------------------
 [New Topics]
 
+* ak/p4 (Sun Aug 10 19:26:35 2008 +0100) 12 commits
+ + Put in the two other configuration elements found in the source
+ + Put some documentation in about the parameters that have been
+   added
+ + Move git-p4.syncFromOrigin into a configuration parameters section
+ + Consistently use 'git-p4' for the configuration entries
+ + If the user has configured various parameters, use them.
+ + Switch to using 'p4_build_cmd'
+ + If we are in verbose mode, output what we are about to run (or
+   return)
+ + Add a single command that will be used to construct the 'p4'
+   command
+ + Utilise the new 'p4_system' function.
+ + Have a command that specifically invokes 'p4' (via system)
+ + Utilise the new 'p4_read_pipe_lines' command
+ + Create a specific version of the read_pipe_lines command for p4
+   invocations
+
+Warmly received by the primary contributor of git-p4; I do not mind
+merging this before 1.6.0.
+
+* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
+ - Make builtin-revert.c use merge_recursive_generic()
+ - merge-recursive.c: Add more generic merge_recursive_generic()
+ - Split out merge_recursive() to merge-recursive.c
+
+I do not think builtlin-revert should use "recursive", but these patches
+give a good starting point to separate the bulk of the "rename-aware
+three-way merge" into library form.
+
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
+ + Documentation: rev-list-options: move --simplify-merges
+   documentation
+
+* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
+ + pack-objects: Allow missing base objects when creating thin packs
+
+* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
+ - filter-branch: use --simplify-merges
+ - Merge branch 'jc/post-simplify' into tr/filter-branch
+ - filter-branch: fix ref rewriting with --subdirectory-filter
+ - filter-branch: Extend test to show rewriting bug
+
+* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
+ + checkout --track: make up a sensible branch name if '-b' was
+   omitted
+
+I like this low-impact usability enhancement; will most likely be in
+master soon after 1.6.0.
+
+* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
+ + xdiff-interface: hide the whole "xdiff_emit_state" business from
+   the caller
+ + Use strbuf for struct xdiff_emit_state's remainder
+ + Make xdi_diff_outf interface for running xdiff_outf diffs
+
+Gives measurable performance improvement to textual diff generation.  For
+improving "blame" performance, it might be more effective to hook directly
+to lower level of xdiff machinery so that we do not even have to generate
+patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
+would be a separate topic.
+
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
+ + Make cherry-pick use rerere for conflict resolution.
+
+----------------------------------------------------------------
+[On Hold and/or Cooking]
+
 * jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
  - tests: use $TEST_DIRECTORY to refer to the t/ directory
 
@@ -30,21 +98,16 @@ meant to be merged to the maintenance series have "maint-" in their names.
    'clean'
  + t9700: remove useless check
 
-* xx/post-1.6.0 (Sun Aug 10 19:10:04 2008 -0400) 3 commits
+* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
+ + git-submodule foreach - Include output and clarify usage.
+ + Fix commit_tree() buffer leak
+ + Teach git log --exit-code to return an appropriate exit code
+ + Teach git log --check to return an appropriate exit code
  + git-submodule - Add 'foreach' subcommand
  + builtin-reflog: Allow reflog expire to name partial ref
  + git-am: ignore --binary option
 
-Some collection of patches to queue for post-1.6.0 development.
-
-----------------------------------------------------------------
-[Graduated to "master"]
-
-* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
- + archive: allow --exec and --remote without equal sign
-
-----------------------------------------------------------------
-[On Hold and/or Cooking]
+Random collection of patches to queue for post-1.6.0 development.
 
 * jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
  + Topo-sort before --simplify-merges
@@ -81,7 +144,8 @@ a similar fix for the case where "a" is a submodule.
 Gives a bit more flexibility to hash-objects by allowing us to lie about
 the path the contents comes from.
 
-* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
+* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
+ + Update .gitignore to ignore git-help
  + Builtin git-help.
  + builtin-help: always load_command_list() in cmd_help()
  + Add a second testcase for handling invalid strategies in git-merge
@@ -91,7 +155,7 @@ the path the contents comes from.
    builtins
 
 * 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
+ + 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