Teach notes code to properly preserve non-notes in the notes tree

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 8cb32e156b77e22da22525d95d783321082b5875..396b9653a3ad80490cf360c86a910edff58862a2 100644 (file)
--- 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,9 +96,31 @@ 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' \
+    'mv file file.orig &&
+    {
+       cat file.orig &&
+       echo
+    } | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" > file &&
+    echo "incomplete" | tr -d "\\012" >>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'