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

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 1148b0257..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' \