Merge branch 'mm/config-xdg'

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index d9ad633310a19a9ebbc2e5024875278d4631129e..24e9b1974d17a02dd1c668e888a67f894e7a1209 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -351,6 +351,11 @@ test_expect_success 'grep -f, multiple patterns' '
        test_cmp expected actual
 '
 
+test_expect_success 'grep, multiple patterns' '
+       git grep "$(cat patterns)" >actual &&
+       test_cmp expected actual
+'
+
 cat >expected <<EOF
 file:foo mmap bar
 file:foo_mmap bar