X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fannotate-tests.sh;h=8baf2fef69ba6a67641d2b9ba4dc44468aa31ada;hb=173a9cbe7031bc3574b3f41cb2d2375cf959ff2a;hp=8cb32e156b77e22da22525d95d783321082b5875;hpb=3bcd59a546333ae355c87577ba63f8dccd50a519;p=git.git

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 8cb32e156..8baf2fef6 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>) {
@@ -94,9 +95,26 @@ test_expect_success \
 test_expect_success \
     'merge-setup part 4' \
     'echo "evil merge." >>file &&
-     EDITOR=: 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' \
     'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
 
+test_expect_success \
+    'an incomplete line added' \
+    'echo "incomplete" | tr -d "\\012" >>file &&
+    GIT_AUTHOR_NAME="C" git commit -a -m "Incomplete"'
+
+test_expect_success \
+    'With incomplete lines.' \
+    'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1'
+
+test_expect_success \
+    'some edit' \
+    'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
+    GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
+
+test_expect_success \
+    'some edit' \
+    'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1'