aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
commitb79376cdf3bd6ee922261776613d085a7b36ffd9 (patch)
tree544b5717e8c87ad8c8770273e9c79ff494441c0d /t
parent47afed5dc17faf10fde18789b17cf6ebff829cf4 (diff)
parent2254da06a5473ffde973337bad2c6a96eea61e20 (diff)
downloadgit-b79376cdf3bd6ee922261776613d085a7b36ffd9.tar.gz
git-b79376cdf3bd6ee922261776613d085a7b36ffd9.tar.xz
Merge branch 'maint'
* maint: 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