diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 1148b0257dafd4e9b63e030052b47b527b5c0d3b..b5ceba4acfd8e862cfc5a77672241e07205f70ea 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
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>) {
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' \