X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fannotate-tests.sh;h=b5ceba4acfd8e862cfc5a77672241e07205f70ea;hb=9299c4f147bcff603eef187eb04fe38153571d30;hp=c04f0e1540794c3d4d950c158beee249ba98b726;hpb=64e86c57867593ba0ee77a7b0ff0eb8e9d4d8ed5;p=git.git

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index c04f0e154..b5ceba4ac 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,7 +4,9 @@
 check_count () {
 	head=
 	case "$1" in -h) head="$2"; shift; shift ;; esac
-	$PROG file $head | perl -e '
+	echo "$PROG file $head" >&4
+	$PROG file $head >.result || return 1
+	cat .result | perl -e '
 		my %expect = (@ARGV);
 		my %count = ();
 		while (<STDIN>) {
@@ -94,7 +96,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,7 +113,7 @@ test_expect_success \
 
 test_expect_success \
     'some edit' \
-    'perl -pi -e "s/^1A.*\n$//; s/^3A/99/" file &&
+    'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \