summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-29 11:59:52 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-29 12:07:04 -0700
commitbaa6378ff2106738c74213280904507d0ed8129c (patch)
treef658d6228f0bf0b4ad34c03d79de46427243b1d1 /t
parent72fd13f71c18b438ca3e482c126bcbcaa2dac650 (diff)
downloadgit-baa6378ff2106738c74213280904507d0ed8129c.tar.gz
log --grep-reflog: reject the option without -g
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7810-grep.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 3a5d0fd770..f698001c99 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -572,6 +572,10 @@ test_expect_success 'log grep (9)' '
test_cmp expect actual
'
+test_expect_success 'log --grep-reflog can only be used under -g' '
+ test_must_fail git log --grep-reflog="commit: third"
+'
+
test_expect_success 'log with multiple --grep uses union' '
git log --grep=i --grep=r --format=%s >actual &&
{