aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:20 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:20 -0700
commit3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch)
tree9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 /t
parentcc137194519a8ddbc0514da088fb012bea40df51 (diff)
parentc922b01f54c4bebe84daeacf014cfbc8dc68479b (diff)
downloadgit-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.gz
git-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
Diffstat (limited to 't')
-rwxr-xr-xt/t7002-grep.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index c4938544d..b81593780 100755
--- 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