What's cooking (2012/03 #09)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 2bf78c75fabd7cc3f6c2d55925f9491024366ab6..7ec318294d5defcba22e9f472319098968c3643a 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,15 +1,15 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Mar 2012, #08; Fri, 23)
-X-master-at: c16df57c5a778ef14ede7ad202c74146269d61ac
-X-next-at: 1bdf608349ec8c63dd8b91991095c3368a1e8a87
+Subject: What's cooking in git.git (Mar 2012, #09; Mon, 26)
+X-master-at: fae9d761c78cba1039854b51df6c2f7360e59cba
+X-next-at: 74cd462aafcd177c1507741065d5836c6f8424aa
 
-What's cooking in git.git (Mar 2012, #08; Fri, 23)
+What's cooking in git.git (Mar 2012, #09; Mon, 26)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
 
-The tip of 'master' was tagged as 1.7.10-rc2 today.
+The updates for "gitk" part is now ready for 1.7.10.
 
 You can find the changes described here in the integration branches of the
 repositories listed at
@@ -17,18 +17,23 @@ repositories listed at
     http://git-blame.blogspot.com/p/git-public-repositories.html
 
 --------------------------------------------------
-[Graduated to "master"]
+[New Topics]
+
+* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
+ - combine-diff: fix loop index underflow
 
-* am/completion-zsh-fix (2012-03-21) 1 commit
- + contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
+Fixes an age old corner case bug in combine diff (only triggered with -U0
+and the hunk at the beginning of the file needs to be shown).
 
-* dw/gitweb-doc-grammo (2012-03-23) 1 commit
- + Documentation/gitweb: trivial English fixes
+* sl/autoconf (2012-03-26) 3 commits
+ - configure: be more idiomatic
+ - configure: avoid some code repetitions thanks to m4_{push,pop}def
+ - configure: move definitions of private m4 macros before AC_INIT invocation
 
-Typofix.
+Updates our configure.ac to follow a better "autoconf" style.
 
 --------------------------------------------------
-[New Topics]
+[Stalled]
 
 * lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
  - t4202: add test for "log --graph --stat -p" separator lines
@@ -45,33 +50,8 @@ can be back-merged to older codebase that did not have 7f81463 (Use
 correct grammar in diffstat summary line, 2012-02-01) that first appeared
 in v1.7.9.2
 
-* wk/gitweb-snapshot-use-if-modified-since (2012-03-20) 1 commit
- - Pull gitweb If-Modified-Since handling out into its own function and use for snapshots.
-
-Unreviewed; the title looks way too long and does not sit well in the
-shortlog output.
-
-* jc/maint-merge-autoedit (2012-03-20) 1 commit
- - merge: backport GIT_MERGE_AUTOEDIT support
-
-In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help
-older scripts to let them refuse giving users a chance to explain the
-merge, but forgot that 1.7.9 automatically opens an editor when merging an
-annotated tag, and there is no equivalent escape hatch.  A merge of this
-topic to 1.7.10 track becomes a no-op, but we may want to apply this to
-the 1.7.9.x series.
-
-* jk/diff-no-rename-empty (2012-03-23) 4 commits
- - merge-recursive: don't detect renames of empty files
- - teach diffcore-rename to optionally ignore empty content
- - make is_empty_blob_sha1 available everywhere
- - drop casts from users EMPTY_TREE_SHA1_BIN
-
-Forbids rename detection logic from matching two empty files as renames
-during merge-recursive to prevent mismerges.
-
---------------------------------------------------
-[Stalled]
+With a review from Zbigniew, I would expect that this would be rerolled
+again.
 
 * cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
  . apply: reallocate the postimage buffer when needed
@@ -181,7 +161,34 @@ not working :-(.
 --------------------------------------------------
 [Cooking]
 
-* th/difftool-diffall (2012-03-23) 9 commits
+* wk/gitweb-snapshot-use-if-modified-since (2012-03-26) 3 commits
+ - gitweb: add If-Modified-Since handling to git_snapshot().
+ - gitweb: refactor If-Modified-Since handling
+ - gitweb: add `status` headers to git_feed() responses.
+
+Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,
+based on the commit date.
+
+* jc/maint-merge-autoedit (2012-03-20) 1 commit
+ - merge: backport GIT_MERGE_AUTOEDIT support
+
+In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help
+older scripts to let them refuse giving users a chance to explain the
+merge, but forgot that 1.7.9 automatically opens an editor when merging an
+annotated tag, and there is no equivalent escape hatch.  A merge of this
+topic to 1.7.10 track becomes a no-op, but we may want to apply this to
+the 1.7.9.x series.
+
+* jk/diff-no-rename-empty (2012-03-23) 4 commits
+ - merge-recursive: don't detect renames of empty files
+ - teach diffcore-rename to optionally ignore empty content
+ - make is_empty_blob_sha1 available everywhere
+ - drop casts from users EMPTY_TREE_SHA1_BIN
+
+Forbids rename detection logic from matching two empty files as renames
+during merge-recursive to prevent mismerges.
+
+* th/difftool-diffall (2012-03-26) 9 commits
  - difftool: print list of valid tools with '--tool-help'
  - difftool: teach difftool to handle directory diffs
  - difftool: replace system call with Git::command_noisy
@@ -208,7 +215,8 @@ working trees that are at the top-level of the current project by mistake.
 
 Not urgent.
 
-* ct/advise-push-default (2012-03-19) 1 commit
+* ct/advise-push-default (2012-03-26) 2 commits
+ - clean up struct ref's nonfastforward field
  - push: Provide situational hints for non-fast-forward errors
 
 Breaks down the cases in which "git push" fails due to non-ff into three