t6042: Add failing testcase for rename/modify/add-source conflict

diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 45cb60ea4b167676b07ae1c847c0467f2a5e3d69..41962f04a715ea5250360766dc64986c4ecf7981 100755 (executable)
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -6,10 +6,11 @@ test_description='git annotate'
 PROG='git annotate'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
-test_expect_success \
-    'Annotating an old revision works' \
-    '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") -eq 2 ] && \
-     [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") -eq 2 ]'
-
+test_expect_success 'Annotating an old revision works' '
+       git annotate file master >result &&
+       awk "{ print \$3; }" <result >authors &&
+       test 2 = $(grep A <authors | wc -l) &&
+       test 2 = $(grep B <authors | wc -l)
+'
 
 test_done