Merge branch 'jc/apply-beyond-symlink' into maint

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 245406ab979d63d3588c4e2000b02cc5f24e493b..8cffd35fb03d7ca5abbd1a229c6c8533f8c5e917 100755 (executable)
--- 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