What's cooking (2008/08 #05)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index d969efe5fc546559b9d08bd471afc49c5e5fa3ab..b968518f27582878523442c5f5ae7a08cd1916ff 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,8 +1,8 @@
-Subject: What's cooking in git.git (Aug 2008, #04; Sun, 17)
-X-master-at: 053fd0c1c3da20474c4ff175c56ea4c1d6eeda11
-X-next-at: d4dfb3b89c69c0c009978a2948b4f87dee11a648
+Subject: What's cooking in git.git (Aug 2008, #05; Tue, 19)
+X-master-at: c6670b348cb19c74a6d7f6943df4871eb0d8295f
+X-next-at: 2fad1ef69ea50e7d9a61a65603ad04bcc079ac0e
 
-What's cooking in git.git (Aug 2008, #04; Sun, 17)
+What's cooking in git.git (Aug 2008, #05; Tue, 19)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed
@@ -12,40 +12,67 @@ 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.
 
+Tonight's 'pu' does not pass tests because test vectors have not been
+adjusted for the changes brought in by the jc/diff-prefix topic.
+
 ----------------------------------------------------------------
 [New Topics]
 
-* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
- - configure: auto detect dynamic library path switches
- - Makefile: Allow CC_LD_DYNPATH to be overriden
+* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
+ - Revert "Windows: Use a customized struct stat that also has the
+   st_blocks member."
+ - compat: introduce on_disk_bytes()
 
-* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
- + index: future proof for "extended" index entries
+This gets rid of use of st_blocks member (which is XSI but not POSIX
+proper), which was originally prompted by recent Haiku port but it turns
+out MinGW has the same issue as well.  Queued on 'pu' just to have a
+chance to make sure I munged the version j6t sent me correctly before
+merging it upwards.
 
-* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
- + Make push more verbose about illegal combination of options
+* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
+ + git-submodule - Add 'foreach' subcommand
 
-* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
- + count-objects: Add total pack size to verbose output
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
+ - git-am --forge: add Signed-off-by: line for the author
+ - git-am: clean-up Signed-off-by: lines
+ - stripspace: add --log-clean option to clean up signed-off-by:
+   lines
+ - stripspace: use parse_options()
+ - Add "git am -s" test
+ - git-am: refactor code to add signed-off-by line for the committer
 
-This one is without the human readable bits.
+* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
+ + Teach git log --exit-code to return an appropriate exit code
+ + Teach git log --check to return an appropriate exit code
 
-* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
- - date/time: do not get confused by fractional seconds
+* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
+ + Fix commit_tree() buffer leak
 
-Linus hints further enhancements as "the right way", so let's see if
-somebody else steps up and tries it before merging this to 'next'.
+* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
+ + builtin-reflog: Allow reflog expire to name partial ref
 
-* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
- - git-daemon: rewrite kindergarden, new option --max-connections
- - git-daemon: Simplify dead-children reaping logic
- - git-daemon: use LOG_PID, simplify logging code
- - git-daemon: call logerror() instead of error()
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ - "git push": tellme-more protocol extension
 
-Can somebody who actually runs the daemon standalone comment on this one?
+* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
+ - WIP: start teaching the --whitespace=fix to merge machinery
+
+* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
+ - gitweb: use new Git::Repo API, and add optional caching
+ - add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
+   Git::RepoRoot
+ - gitweb: add test suite with Test::WWW::Mechanize::CGI
+
+* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
+ - diff: vary default prefix depending on what are compared
+
+* 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
 
 ----------------------------------------------------------------
-[On Hold and/or Cooking]
+[Graduated to "master"]
 
 * ak/p4 (Thu Aug 14 23:40:39 2008 +0100) 14 commits
  + Utilise our new p4_read_pipe and p4_write_pipe wrappers
@@ -67,38 +94,16 @@ Can somebody who actually runs the daemon standalone comment on this one?
  + 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 (final call for "Yays").
-
-* 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
+Warmly received by the primary contributors of git-p4; this was merged as
+part of 1.6.0.
 
-* 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
+----------------------------------------------------------------
+[Will merge to master soon]
 
 * 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, but not before.
-
 * 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
@@ -111,58 +116,6 @@ 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.
-
-* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
- + tests: use $TEST_DIRECTORY to refer to the t/ directory
-
-* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
- + Add test for diff-tree --stdin with two trees
- + Teach git diff-tree --stdin to diff trees
- + diff-tree: Note that the commit ID is printed with --stdin
- + Refactoring: Split up diff_tree_stdin
-
-* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
- + Enable parallel tests
- + tests: Clarify dependencies between tests, 'aggregate-results' and
-   'clean'
- + t9700: remove useless check
-
-* 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
-
-Random collection of patches to queue for post-1.6.0 development.
-
-* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 7 commits
- - revision --simplify-merges: incremental simplification
- - revision --simplify-merges: prepare for incremental simplification
- - revision --simplify-merges: make it a no-op without pathspec
- + revision --simplify-merges: use decoration instead of commit->util
-   field
- + Topo-sort before --simplify-merges
- + revision traversal: show full history with merge simplification
- + revision.c: whitespace fix
-
-"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.
-
-I started making this incremental but the progress is not so great.
-
-* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
- - [do not merge -- original version] Add Git-aware CGI for Git-aware
-   smart HTTP transport
- - Add backdoor options to receive-pack for use in Git-aware CGI
-
-The "magic" detection protocol was revised to use POST to info/refs; the
-top one queued is from before that discussion.
-
 * jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
  + add: refuse to add working tree items beyond symlinks
  + update-index: refuse to add working tree items beyond symlinks
@@ -192,6 +145,23 @@ the path the contents comes from.
  + builtin-help: make some internal functions available to other
    builtins
 
+* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
+ + Add test for diff-tree --stdin with two trees
+ + Teach git diff-tree --stdin to diff trees
+ + diff-tree: Note that the commit ID is printed with --stdin
+ + Refactoring: Split up diff_tree_stdin
+
+* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
+ + count-objects: Add total pack size to verbose output
+
+This one is without the human readable bits.
+
+* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
+ + Make push more verbose about illegal combination of options
+
+* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
+ + index: future proof for "extended" index entries
+
 * 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
@@ -213,14 +183,6 @@ 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.
 
-* 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
-
-The first one alone does not pass its self-test but combined together they
-seem to.  It does not build confidence as the latter one is supposed to be
-an optimization only.
-
 * 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
@@ -236,6 +198,105 @@ 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.
 
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
+ + Make cherry-pick use rerere for conflict resolution.
+
+* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
+ + Update t/.gitignore to ignore all trash directories
+ + Enable parallel tests
+ + tests: Clarify dependencies between tests, 'aggregate-results' and
+   'clean'
+ + t9700: remove useless check
+
+* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
+ + tests: use $TEST_DIRECTORY to refer to the t/ directory
+
+This does not actually move "t/test directory" any deeper, but fixes test
+scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
+variable.
+
+----------------------------------------------------------------
+[Actively Cooking]
+
+* 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) 3 commits
+ + filter-branch: use --simplify-merges
+ + filter-branch: fix ref rewriting with --subdirectory-filter
+ + filter-branch: Extend test to show rewriting bug
+
+Fixes a longstanding filter branch bug.
+
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
+ - revision --simplify-merges: incremental simplification
+ - revision --simplify-merges: prepare for incremental simplification
+ - revision --simplify-merges: make it a no-op without pathspec
+ + revision --simplify-merges: do not leave commits unprocessed
+ + revision --simplify-merges: use decoration instead of commit->util
+   field
+ + Topo-sort before --simplify-merges
+ + revision traversal: show full history with merge simplification
+ + revision.c: whitespace fix
+
+"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.
+
+I started making this incremental but the progress is not so great.
+
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
+ + Documentation: rev-list-options: move --simplify-merges
+   documentation
+
+----------------------------------------------------------------
+[On Hold]
+
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
+ - date/time: do not get confused by fractional seconds
+
+Linus hints further enhancements as "the right way", so let's see if
+somebody else steps up and tries it before merging this to 'next'.
+
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
+ - configure: auto detect dynamic library path switches
+ - Makefile: Allow CC_LD_DYNPATH to be overriden
+
+Needs success reports from people who do use user-defined dynamic library
+path when they build their "git" before this series can go anywhere.
+
+* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
+ - git-daemon: rewrite kindergarden, new option --max-connections
+ - git-daemon: Simplify dead-children reaping logic
+ - git-daemon: use LOG_PID, simplify logging code
+ - git-daemon: call logerror() instead of error()
+
+Can somebody who actually runs the daemon standalone comment on this one?
+
+* 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.
+
+* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
+ - [do not merge -- original version] Add Git-aware CGI for Git-aware
+   smart HTTP transport
+ - Add backdoor options to receive-pack for use in Git-aware CGI
+
+The "magic" detection protocol was revised to use POST to info/refs; the
+top one queued is from before that discussion.
+
+* 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
+
+The first one alone does not pass its self-test but combined together they
+seem to.  It does not build confidence as the latter one is supposed to be
+an optimization only.  Resend of fixed-up series is needed.
+
 * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
  + merge: remove deprecated summary and diffstat options and config
    variables
@@ -245,10 +306,8 @@ that the synonyms to the ones this one deletes are fairly new invention
 that happend in 1.5.6 timeframe, and we cannot do this just yet.  Perhaps
 in 1.7.0.
 
-* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
- + Revert "Make clients ask for "git program" over ssh and local
-   transport"
- + Make clients ask for "git program" over ssh and local transport
+* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
+ - Make clients ask for "git program" over ssh and local transport
 
 This is the "botched" one.  Will be resurrected during 1.7.0 or 1.8.0
 timeframe.