What's cooking (2008/08 #02)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index c91bcf9a0883130a6a34348aa4e066020f1346ed..394b44a983e5544f44facd375d1ac94a5a28af17 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,6 +1,8 @@
-Subject: What's cooking in git.git (Aug 2008, #01; Tue, 05)
+Subject: What's cooking in git.git (Aug 2008, #02; Mon, 11)
+X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6
+X-next-at: 3cb9d94cdc74f3137599446af9f5442b7ae1ab27
 
-What's cooking in git.git (Aug 2008, #01; Tue, 05)
+What's cooking in git.git (Aug 2008, #02; Mon, 11)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed
@@ -10,20 +12,39 @@ 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.
 
-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
-same as usual, though.  After -rc1 is tagged, please run 'master' for your
-daily git use instead, in order to make sure 'master' does what it claims
-to do without regression.
+----------------------------------------------------------------
+[New Topics]
+
+* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
+ - tests: use $TEST_DIRECTORY to refer to the t/ directory
 
-Tentative schedule, my wishful thinking:
+* 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
 
- - 1.6.0-rc2 (Aug  6)
- - 1.6.0-rc3 (Aug 10)
+* 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 (Sun Aug 10 19:10:04 2008 -0400) 3 commits
+ + 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.
 
 ----------------------------------------------------------------
-[New Topics]
+[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]
 
 * jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
  + Topo-sort before --simplify-merges
@@ -42,11 +63,12 @@ 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
+ + add: refuse to add working tree items beyond symlinks
+ + update-index: refuse to add working tree items beyond symlinks
 
-The performance impact of this needs to be discussed in a separate
-thread.
+Fix for a longstanding bug that allows "git add" and "git update-index" to
+add a path "a/b" to the index when "a" is a symbolic link.  We would need
+a similar fix for the case where "a" is a submodule.
 
 * dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
  + add --no-filters option to git hash-object
@@ -59,20 +81,6 @@ thread.
 Gives a bit more flexibility to hash-objects by allowing us to lie about
 the path the contents comes from.
 
-* jn/svn-log (Sun Aug 3 14:07:21 2008 +0200) 1 commit
- - git-svn: --clean-changelog=<style> to sanitize messages
-
-Eric firmly rejected this one so I won't be merging this to 'next' but
-this was an interesting firestarter for discussion nevertheless.
-
-----------------------------------------------------------------
-[On Hold and/or Cooking]
-
-* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
- + archive: allow --exec and --remote without equal sign
-
-None of the following is for 1.6.0.
-
 * mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
  + Builtin git-help.
  + builtin-help: always load_command_list() in cmd_help()
@@ -144,7 +152,7 @@ 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