Merge branch 'pw/am-signoff' into next

diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index 169fd8d7065f89ce78f5241eeb7bf376c3f3172d..0059a1f837882c504e717135c9c92bc5b1d7f62c 100755 (executable)
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -20,13 +20,13 @@ test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
        git grep -i "TILRAUN: HALLÓ HEIMUR!"
 '
 
-test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 icase' '
+test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 icase' '
        git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
        git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
        git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
 '
 
-test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '
+test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
        test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
        git add file2 &&
        git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
@@ -36,29 +36,14 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '
 '
 
 test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
-       git grep --debug -i -F "TILRAUN: Halló Heimur!"  2>&1 >/dev/null |
-                grep fixed >debug1 &&
-       test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
-       test_cmp expect1 debug1 &&
-
-       git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!"  2>&1 >/dev/null |
-                grep fixed >debug2 &&
-       test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
-       test_cmp expect2 debug2
+       git grep -i -F "TILRAUN: Halló Heimur!" &&
+       git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
 '
 
 test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
-       test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
-
-       git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1 >/dev/null |
-                grep fixed >debug1 &&
-       test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló \$He\\[]imur!\\\$" >expect1 &&
-       test_cmp expect1 debug1 &&
-
-       git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$"  2>&1 >/dev/null |
-                grep fixed >debug2 &&
-       test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ \$HE\\[]IMUR!\\\$" >expect2 &&
-       test_cmp expect2 debug2
+       test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
+       git add file3 &&
+       git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
 '
 
 test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '