diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:39 -0700 |
| commit | b79376cdf3bd6ee922261776613d085a7b36ffd9 (patch) | |
| tree | 544b5717e8c87ad8c8770273e9c79ff494441c0d /t | |
| parent | 47afed5dc17faf10fde18789b17cf6ebff829cf4 (diff) | |
| parent | 2254da06a5473ffde973337bad2c6a96eea61e20 (diff) | |
| download | git-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-x | t/t7002-grep.sh | 4 |
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 |