diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-28 07:46:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 07:46:20 (GMT) |
| commit | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch) | |
| tree | 9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 /t | |
| parent | cc137194519a8ddbc0514da088fb012bea40df51 (diff) | |
| parent | c922b01f54c4bebe84daeacf014cfbc8dc68479b (diff) | |
| download | git-3e73cb2f48cc4044905455a9936692f967a0f9b3.zip git-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.gz git-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.bz2 | |
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-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 c493854..b815937 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 |