Here are the topics that have been cooking.  Commits prefixed with '-' are
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.

I'll soon be tagging 1.7.1-rc2; please test 'master', report & fix
regressions.

--------------------------------------------------
[New Topics]

* jk/maint-diffstat-overflow (2010-04-17) 1 commit
 - diff: use large integers for diffstat calculations

* jn/t7006-fixup (2010-04-14) 1 commit
 - t7006: guard cleanup with test_expect_success

* js/maint-receive-pack-symref-alias (2010-04-15) 2 commits
 - receive-pack: ignore duplicated commands which can occur with symrefs
 - receive-pack: Switch global variable 'commands' to a parameter

* sp/maint-dumb-http-pack-reidx (2010-04-17) 11 commits
 - http-fetch: Use temporary files for pack-*.idx until verified
 - http-fetch: Use index-pack rather than verify-pack to check packs
 - Allow parse_pack_index on temporary files
 - Extract verify_pack_index for reuse from verify_pack
 - Introduce close_pack_index to permit replacement
 - http.c: Remove unnecessary strdup of sha1_to_hex result
 - http.c: Don't store destination name in request structures
 - http.c: Drop useless != NULL test in finish_http_pack_request
 - http.c: Tiny refactoring of finish_http_pack_request
 - t5550-http-fetch: Use subshell for repository operations
 - http.c: Remove bad free of static block

* wp/doc-filter-direction (2010-04-17) 1 commit
 - documentation: clarify direction of core.autocrlf

--------------------------------------------------
[Graduated to "master"]

* jc/doc-submit-gmail (2010-04-07) 1 commit
  (merged to 'next' on 2010-04-10 at cd4e8cf)
 + SubmittingPatches: update GMail section

--------------------------------------------------
[Stalled]

* rr/remote-helper-doc (2010-04-07) 3 commits
 - Documentation/remote-helpers: Add invocation section
 - Documentation/urls: Rewrite to ...
[ message continues ]

I think the last round looked good, and this would ideally go into
v1.7.1, as it fixes a segfault. It is getting a bit late in the -rc
cycle, though. I guess the other option is to close the segfault with a
one-liner and just make %N a no-op for v1.7.1, and then fix it right for
v1.7.2.  I think I would prefer to have Johannes' patch right away,
though.

-Peff
--

[ message continues ]

It is an assertion failure but the fix is low-impact enough to appear in
the coming release.

 t/t3301-notes.sh |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index b2e7b07..64f32ad 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -55,6 +55,15 @@ test_expect_success 'handle empty notes gracefully' '
 	git notes show ; test 1 = $?
 '
 
+test_expect_success 'show non-existent notes entry with %N' '
+	for l in A B
+	do
+		echo "$l"
+	done >expect &&
+	git show -s --format='A%n%NB' >output &&
+	test_cmp expect output
+'
+
 test_expect_success 'create notes' '
 	git config core.notesRef refs/notes/commits &&
 	MSG=b4 git notes add &&
@@ -65,6 +74,15 @@ test_expect_success 'create notes' '
 	test_must_fail git notes show HEAD^
 '
 
+test_expect_success 'show notes entry with %N' '
+	for l in A b4 B
+	do
+		echo "$l"
+	done >expect &&
+	git show -s --format='A%n%NB' >output &&
+	test_cmp expect output
+'
+
 cat >expect <<EOF
 d423f8c refs/notes/commits@{0}: notes: Notes added by 'git notes add'
 EOF
--

[ message continues ]

Yeah, I forgot it was an assertion and not a segfault, but I think both

Your tests look sane to me.

-Peff
--

[ message continues ]