Merge branch 'maint'

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 2ac93a346d016c65614f2bf6142049e7bdc39bd1..9f6454d2ffa22ef8a207b1a4e5e2ba156e84cdb9 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -226,7 +226,7 @@ test_expect_success 'git add '\''fo\[ou\]bar'\'' ignores foobar' '
        git reset --hard &&
        touch fo\[ou\]bar foobar &&
        git add '\''fo\[ou\]bar'\'' &&
-       git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
+       git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
        ! ( git ls-files foobar | grep foobar )
 '