Merge branch 'tr/maint-format-patch-empty-output'

diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index 2320e74b69af81a5ead33b90bc3cc40d1995e9ce..917a264eea6c6b3593e9f19caadbef715daace20 100755 (executable)
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -5,7 +5,7 @@ test_description='git grep in binary files'
 . ./test-lib.sh
 
 test_expect_success 'setup' "
-       printf 'binary\000file\n' >a &&
+       echo 'binaryQfile' | q_to_nul >a &&
        git add a &&
        git commit -m.
 "
@@ -27,6 +27,18 @@ test_expect_success 'git grep -I ina a' '
        test_cmp expect actual
 '
 
+test_expect_success 'git grep -c ina a' '
+       echo a:1 >expect &&
+       git grep -c ina a >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'git grep -l ina a' '
+       echo a >expect &&
+       git grep -l ina a >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'git grep -L bar a' '
        echo a >expect &&
        git grep -L bar a >actual &&
@@ -39,4 +51,52 @@ test_expect_success 'git grep -q ina a' '
        test_cmp expect actual
 '
 
+test_expect_success 'git grep -F ile a' '
+       git grep -F ile a
+'
+
+test_expect_success 'git grep -Fi iLE a' '
+       git grep -Fi iLE a
+'
+
+# This test actually passes on platforms where regexec() supports the
+# flag REG_STARTEND.
+test_expect_success 'git grep ile a' '
+       git grep ile a
+'
+
+test_expect_failure 'git grep .fi a' '
+       git grep .fi a
+'
+
+test_expect_success 'git grep -F y<NUL>f a' "
+       printf 'yQf' | q_to_nul >f &&
+       git grep -f f -F a
+"
+
+test_expect_success 'git grep -F y<NUL>x a' "
+       printf 'yQx' | q_to_nul >f &&
+       test_must_fail git grep -f f -F a
+"
+
+test_expect_success 'git grep -Fi Y<NUL>f a' "
+       printf 'YQf' | q_to_nul >f &&
+       git grep -f f -Fi a
+"
+
+test_expect_success 'git grep -Fi Y<NUL>x a' "
+       printf 'YQx' | q_to_nul >f &&
+       test_must_fail git grep -f f -Fi a
+"
+
+test_expect_success 'git grep y<NUL>f a' "
+       printf 'yQf' | q_to_nul >f &&
+       git grep -f f a
+"
+
+test_expect_success 'git grep y<NUL>x a' "
+       printf 'yQx' | q_to_nul >f &&
+       test_must_fail git grep -f f a
+"
+
 test_done