Merge branch 'jh/empty-notes'

gitster · gitster · commit ee443cf236ff · 2015-01-22T13:42:37.000-08:00
* jh/empty-notes:
  Fix unclosed here document in t3301.sh
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
@@ -658,7 +658,7 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
 '
 
 test_expect_success '--no-standard-notes' '
-	cat >expect-commits <<EOF
+	cat >expect-commits <<-EOF &&
 		commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
 		Author: A U Thor <author@example.com>
 		Date:   Thu Apr 7 15:18:13 2005 -0700

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '`
`658`	`658`	`'`
`659`	`659`
`660`	`660`	`test_expect_success '--no-standard-notes' '`
`661`		`- cat >expect-commits <<EOF`
	`661`	`+ cat >expect-commits <<-EOF &&`
`662`	`662`	`commit 2c125331118caba0ff8238b7f4958ac6e93fe39c`
`663`	`663`	`Author: A U Thor <author@example.com>`
`664`	`664`	`Date: Thu Apr 7 15:18:13 2005 -0700`