What's cooking (2010/07 #03)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 6fff4005e501943d98fe2d5d8161ae54d9b2d4e5..0f62ccc3c6dccc73fc7405b36800949cd232be04 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,9 +1,9 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Jul 2010, #02; Wed, 14)
-X-master-at: fc051572a3fe171286f10761bd33946c48de3f7f
-X-next-at: 910a0b50db9dba6767ac37e4782912a006093248
+Subject: What's cooking in git.git (Jul 2010, #03; Fri, 16)
+X-master-at: 24e7a5be373c95f977bab4f0f41f736bb1d25075
+X-next-at: 917297fa2312cb1baef4b7467153f116c1850589
 
-What's cooking in git.git (Jul 2010, #02; Wed, 14)
+What's cooking in git.git (Jul 2010, #03; Fri, 16)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -11,13 +11,105 @@ only in 'pu' while commits prefixed with '+' are in 'next'.  The ones
 marked with '.' do not appear in any of the integration branches, but I am
 still holding onto them.
 
-v1.7.2-rc3 has been tagged and hopefully we can have the final release
-this weekend.  I've moved some fixes from 'pu' to 'next' but I'd like to
-defer them for a bit longer.
+I've ended up merging a few more fixes to 'master'; please give it a good
+final round of testing so that we can have the real thing mid next week.
+
+Thanks.
 
 --------------------------------------------------
 [New Topics]
 
+* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
+ - sha1_file: Show the the type and path to corrupt objects
+
+* cc/revert (2010-07-14) 4 commits
+ - revert: improve success message by adding abbreviated commit sha1
+ - revert: don't print "Finished one cherry-pick." if commit failed
+ - revert: refactor commit code into a new run_git_commit() function
+ - revert: report success when using option --strategy
+
+* en/fast-export-fix (2010-07-07) 2 commits
+ . fast-export: Add a --full-tree option
+ . fast-export: Fix dropping of files with --import-marks and path limiting
+
+Seems to have breakage in test 9350 (possibly others but I didn't look).
+
+* jn/parse-date-basic (2010-07-15) 1 commit
+ - Export parse_date_basic() to convert a date string to timestamp
+ (this branch is used by rr/svn-export.)
+
+* kf/post-receive-sample-hook (2010-07-16) 1 commit
+ - post-receive-email: optional message line count limit
+
+* tr/rfc-reset-doc (2010-07-16) 5 commits
+ - Documentation/reset: move "undo permanently" example behind "make topic"
+ - Documentation/reset: reorder examples to match description
+ - Documentation/reset: promote 'examples' one section up
+ - Documentation/reset: separate options by mode
+ - Documentation/git-reset: reorder modes for soft-mixed-hard progression
+
+--------------------------------------------------
+[Graduated to "master"]
+
+* ab/submodule-add-f (2010-07-05) 1 commit
+  (merged to 'next' on 2010-07-14 at 4ab3d00)
+ + git submodule: add submodules with git add -f <path>
+
+* bc/maint-makefile-fixes (2010-07-06) 2 commits
+  (merged to 'next' on 2010-07-14 at 294ab08)
+ + Makefile: work around ksh's failure to handle missing list argument to for loop
+ + Makefile: remove some unnecessary curly braces
+
+* eb/doc-log-manpage (2010-07-07) 1 commit
+  (merged to 'next' on 2010-07-14 at d073ef2)
+ + Reorganize `git-log' man page to clarify common diff options.
+
+* jc/diff-merge-base-multi (2010-07-16) 2 commits
+ + diff A...B: do not limit the syntax too narrowly
+ + diff A...B: give one possible diff when there are more than one merge-base
+
+* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
+  (merged to 'next' on 2010-07-14 at 2273bd2)
+ + rebase-i: do not get fooled by a log message ending with backslash
+ + rebase-i: style fix
+
+* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
+  (merged to 'next' on 2010-07-14 at 43cc5ef)
+ + do not write out index when status does not have to
+
+* jn/grep-open (2010-07-02) 1 commit
+  (merged to 'next' on 2010-07-14 at c057fd6)
+ + grep -O: Do not pass color sequences as filenames to pager
+
+* jn/paginate-fix (2010-06-26) 4 commits
+ + git --paginate: do not commit pager choice too early
+ + tests: local config file should be honored from subdirs of toplevel
+ + t7006: test pager configuration for several git commands
+ + t7006 (pager): introduce helper for parameterized tests
+
+* jn/tests (2010-07-10) 1 commit
+  (merged to 'next' on 2010-07-14 at 390c1f6)
+ + t3000 (ls-files -o): modernize style
+
+* js/merge-rr-fix (2010-07-14) 1 commit
+ + MERGE_RR is in .git, not .git/rr-cache
+
+* mg/revision-doc (2010-07-05) 3 commits
+  (merged to 'next' on 2010-07-14 at 416a2ad)
+ + Documentation: link to gitrevisions rather than git-rev-parse
+ + Documentation: gitrevisions
+ + Documentation: split off rev doc into include file
+
+* ns/merge-recursive-uptodate (2010-07-09) 1 commit
+ + merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
+
+* wp/merge-tree-fix (2010-07-14) 2 commits
+ + merge-tree: fix where two branches share no changes
+ + add basic tests for merge-tree
+
+--------------------------------------------------
+[Stalled -- would discard unless there are some movements soon]
+
 * by/log-range-diff (2010-07-12) 18 commits
  . Minimum fix to make by/log-range-diff topic at least compile
  . add test cases for '--graph' of line level log
@@ -40,41 +132,6 @@ defer them for a bit longer.
 
 Seems to break some tests in t403X range but we are not in a hurry.
 
-* eb/doc-log-manpage (2010-07-07) 1 commit
-  (merged to 'next' on 2010-07-14 at d073ef2)
- + Reorganize `git-log' man page to clarify common diff options.
-
-* hv/autosquash-config (2010-07-14) 1 commit
- - add configuration variable for --autosquash option of interactive rebase
-
-* jh/graph-next-line (2010-07-13) 2 commits
- - Enable custom schemes for column colors in the graph API
- - Make graph_next_line() available in the graph.h API
-
-* jl/add-n-ignore-missing (2010-07-10) 1 commit
- - git add: Add the "--ignore-missing" option for the dry run
-
-* jn/tests (2010-07-10) 1 commit
-  (merged to 'next' on 2010-07-14 at 390c1f6)
- + t3000 (ls-files -o): modernize style
-
-* ns/merge-recursive-uptodate (2010-07-09) 1 commit
- - merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
-
-* jc/diff-merge-base-multi (2010-07-12) 1 commit
-  (merged to 'next' on 2010-07-14 at 910a0b5)
- + diff A...B: give one possible diff when there are more than one merge-base
-
-* js/merge-rr-fix (2010-07-14) 1 commit
- - MERGE_RR is in .git, not .git/rr-cache
-
-* wp/merge-tree-fix (2010-07-14) 2 commits
- - merge-tree: fix where two branches share no changes
- - add basic tests for merge-tree
-
---------------------------------------------------
-[Stalled -- would discard unless there are some movements soon]
-
 * ps/gitweb-soc (2010-06-02) 2 commits
   (merged to 'next' on 2010-06-13 at 92245ae)
  + git-instaweb: Add option to reuse previous config file
@@ -97,17 +154,6 @@ moving forward.
 
 I recall there was another round of re-roll planned for this one.
 
-* rr/svn-export (2010-06-10) 7 commits
- - Add LICENSE
- - Add SVN dump parser
- - Add infrastructure to write revisions in fast-export format
- - Add stream helper library
- - Add library for string-specific memory pool
- - Add cpp macro implementation of treaps
- - Add memory pool library
-
-I recall there was another round of re-roll planned for this one.
-
 * jk/tag-contains (2010-07-05) 4 commits
  - Why is "git tag --contains" so slow?
  - default core.clockskew variable to one day
@@ -117,11 +163,26 @@ I recall there was another round of re-roll planned for this one.
 --------------------------------------------------
 [Cooking]
 
-* jn/paginate-fix (2010-06-26) 4 commits
- - git --paginate: do not commit pager choice too early
- - tests: local config file should be honored from subdirs of toplevel
- - t7006: test pager configuration for several git commands
- - t7006 (pager): introduce helper for parameterized tests
+* rr/svn-export (2010-07-15) 8 commits
+ - Add SVN dump parser
+ - Add infrastructure to write revisions in fast-export format
+ - Add stream helper library
+ - Add string-specific memory pool
+ - vcs-svn: treap_search should return NULL for missing items
+ - Add treap implementation
+ - Add memory pool library
+ - Introduce vcs-svn lib
+ (this branch uses jn/parse-date-basic.)
+
+* hv/autosquash-config (2010-07-14) 1 commit
+ - add configuration variable for --autosquash option of interactive rebase
+
+* jh/graph-next-line (2010-07-13) 2 commits
+ - Enable custom schemes for column colors in the graph API
+ - Make graph_next_line() available in the graph.h API
+
+* jl/add-n-ignore-missing (2010-07-10) 1 commit
+ - git add: Add the "--ignore-missing" option for the dry run
 
 * ar/string-list-foreach (2010-07-03) 2 commits
  - Convert the users of for_each_string_list to for_each_string_list_item macro
@@ -132,15 +193,6 @@ I recall there was another round of re-roll planned for this one.
  - New remote helper: git-remote-ext
  - New remote helper git-remote-fd
 
-* ab/submodule-add-f (2010-07-05) 1 commit
-  (merged to 'next' on 2010-07-14 at 4ab3d00)
- + git submodule: add submodules with git add -f <path>
-
-* bc/maint-makefile-fixes (2010-07-06) 2 commits
-  (merged to 'next' on 2010-07-14 at 294ab08)
- + Makefile: work around ksh's failure to handle missing list argument to for loop
- + Makefile: remove some unnecessary curly braces
-
 * gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
   (merged to 'next' on 2010-07-14 at 7d25131)
  + pack-refs: remove newly empty directories
@@ -150,24 +202,9 @@ I recall there was another round of re-roll planned for this one.
  - setup_revisions(): Allow walking history in a submodule
  - Teach ref iteration module about submodules
 
-* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
-  (merged to 'next' on 2010-07-14 at 2273bd2)
- + rebase-i: do not get fooled by a log message ending with backslash
- + rebase-i: style fix
-
-* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
-  (merged to 'next' on 2010-07-14 at 43cc5ef)
- + do not write out index when status does not have to
-
 * jn/fast-import-subtree (2010-06-30) 1 commit
  - Teach fast-import to import subtrees named by tree id
 
-* mg/revision-doc (2010-07-05) 3 commits
-  (merged to 'next' on 2010-07-14 at 416a2ad)
- + Documentation: link to gitrevisions rather than git-rev-parse
- + Documentation: gitrevisions
- + Documentation: split off rev doc into include file
-
 * sg/rerere-gc-old-still-used (2010-07-13) 2 commits
  - rerere: fix overeager gc
  - mingw_utime(): handle NULL times parameter
@@ -185,10 +222,6 @@ I recall there was another round of re-roll planned for this one.
  + Add a rename + D/F conflict testcase
  + Add additional testcases for D/F conflicts
 
-* jn/grep-open (2010-07-02) 1 commit
-  (merged to 'next' on 2010-07-14 at c057fd6)
- + grep -O: Do not pass color sequences as filenames to pager
-
 * ab/i18n (2010-07-10) 1 commit
  - Add infrastructure for translating Git with gettext