Merge branch 'maint-1.6.1' into maint

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index c4938544d4ca7c5e7e886a59144c9b10b7971748..b81593780a2a6adaf34bb10293b607e3a303cfcd 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -26,6 +26,10 @@ test_expect_success setup '
        git commit -m initial
 '
 
+test_expect_success 'grep should not segfault with a bad input' '
+       test_must_fail git grep "("
+'
+
 for H in HEAD ''
 do
        case "$H" in