Merge branch 'nd/git-dir-pointing-at-gitfile' into maint

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 0bfee001b4131d5ce38fbd9c9fb487e22a43507d..d4e7f4736f74e58da504a04be3898b0a4078fedb 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -245,8 +245,8 @@ test_expect_success 'setup -L :regex' '
        git commit -m "hello" &&
 
        mv hello.c hello.orig &&
-       sed -e "/}/i\\
-       Qputs(\"goodbye\");" <hello.orig | tr Q "\\t" >hello.c &&
+       sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+       tr Q "\\t" >hello.c &&
        GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
        git commit -a -m "goodbye" &&