summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-05 10:44:39 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-05 10:44:39 -0700
commitf5206f1239a2f193aed16bac1c3b8cf71dfbce39 (patch)
tree7b468faed815cf069d7696efb0dc2531c0e460ee /t
parenta48ed48db5901f6ba2215826e5f16eca159930ca (diff)
parent3a4fc21a293c2426899df6a8f4a4cf77b3a0642d (diff)
downloadgit-f5206f1239a2f193aed16bac1c3b8cf71dfbce39.tar.gz
Merge branch 'es/blame-L-breakage'
* es/blame-L-breakage: t8001, t8002: fix "blame -L :literal" test on NetBSD
Diffstat (limited to 't')
-rw-r--r--t/annotate-tests.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 0bfee001b4..d4e7f4736f 100644
--- 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" &&