summaryrefslogtreecommitdiff
path: root/t/annotate-tests.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-12 18:34:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-12 18:35:14 -0700
commiteed94a570e0421175d6b4342c0ac48e03ceedf0b (patch)
treef33864f2abffdcb83cbf626b26da34f9cc8d5bab /t/annotate-tests.sh
parent4147d801db66df9b127ffe315601f467aa9d1c48 (diff)
parent01aaf1f88ddc2b99162c302710339f202996f39b (diff)
downloadgit-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 't/annotate-tests.sh')
-rw-r--r--t/annotate-tests.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b6a2edd887..8baf2fef69 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,7 +4,8 @@
check_count () {
head=
case "$1" in -h) head="$2"; shift; shift ;; esac
- $PROG file $head | perl -e '
+ $PROG file $head >.result || return 1
+ cat .result | perl -e '
my %expect = (@ARGV);
my %count = ();
while (<STDIN>) {