diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-05 17:44:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 17:44:39 (GMT) |
| commit | f5206f1239a2f193aed16bac1c3b8cf71dfbce39 (patch) | |
| tree | 7b468faed815cf069d7696efb0dc2531c0e460ee | |
| parent | a48ed48db5901f6ba2215826e5f16eca159930ca (diff) | |
| parent | 3a4fc21a293c2426899df6a8f4a4cf77b3a0642d (diff) | |
| download | git-f5206f1239a2f193aed16bac1c3b8cf71dfbce39.zip git-f5206f1239a2f193aed16bac1c3b8cf71dfbce39.tar.gz git-f5206f1239a2f193aed16bac1c3b8cf71dfbce39.tar.bz2 | |
Merge branch 'es/blame-L-breakage'
* es/blame-L-breakage:
t8001, t8002: fix "blame -L :literal" test on NetBSD
| -rw-r--r-- | t/annotate-tests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 0bfee00..d4e7f47 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" && |