X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fannotate-tests.sh;h=b6a2edd8878c910ad177b8b277bedf99f60d9416;hb=8ff99e7417fcbff67d2c31445671fa97e44c95e7;hp=114938c3ff18fadb130e6809fc14e89cfe3f36f2;hpb=0a8f4f0020cb35095005852c0797f0b90e9ebb74;p=git.git

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 114938c3f..b6a2edd88 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -94,7 +94,7 @@ test_expect_success \
 test_expect_success \
     'merge-setup part 4' \
     'echo "evil merge." >>file &&
-     EDITOR=: VISUAL=: 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' \
@@ -111,9 +111,7 @@ test_expect_success \
 
 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 \