diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 9c5a15a15e6be5548f7cc8836286cc5a8b39d4ca..b6a2edd8878c910ad177b8b277bedf99f60d9416 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
test_expect_success \
'merge-setup part 4' \
'echo "evil merge." >>file &&
- EDITOR=: git commit -a --amend'
+ git commit -a --amend'
test_expect_success \
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
test_expect_success \
'some edit' \
- 'mv file file1 &&
- sed -e 1d -e "5s/3A/99/" file1 >file &&
- rm -f file1 &&
+ 'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
test_expect_success \