summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-22 13:42:37 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-22 13:42:37 -0800
commitee443cf236ffa8f99857e9580df31a53f60d9045 (patch)
tree6d050258aad8ee2d1036e5d6f715e03b0d4bcf3c
parent627736ca799edacf13881da7e671964a0afb94b8 (diff)
parent85cb1d0ba883627f38ad994aa489bf0b3dc40f7f (diff)
downloadgit-ee443cf236ffa8f99857e9580df31a53f60d9045.tar.gz
Merge branch 'jh/empty-notes'
* jh/empty-notes: Fix unclosed here document in t3301.sh
-rwxr-xr-xt/t3301-notes.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 245406ab97..8cffd35fb0 100755
--- 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