X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Fannotate-tests.sh;h=114938c3ff18fadb130e6809fc14e89cfe3f36f2;hb=481176f752f204316ec570c8ab3fdf0c297b3259;hp=8cb32e156b77e22da22525d95d783321082b5875;hpb=3bcd59a546333ae355c87577ba63f8dccd50a519;p=git.git diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 8cb32e15..114938c3 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -94,9 +94,28 @@ test_expect_success \ test_expect_success \ 'merge-setup part 4' \ 'echo "evil merge." >>file && - EDITOR=: git commit -a --amend' + EDITOR=: VISUAL=: 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 file1 && + sed -e 1d -e "5s/3A/99/" file1 >file && + rm -f file1 && + 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'