summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2012-09-14 11:46:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-15 23:35:40 -0700
commit00f62a64d489592c97f6f171f9a19fdda530f3c5 (patch)
treeee47e3614cce2c01687b3603b31b01eb5a77b1a4 /t
parentt7810-grep: test multiple --grep with and without --all-match (diff)
downloadtgif-00f62a64d489592c97f6f171f9a19fdda530f3c5.tar.xz
t7810-grep: test multiple --author with --all-match
The "--all-match" option is about "--grep", and does not affect how "--author" or "--committer" limitation is applied. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7810-grep.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index b841909315..be81d96e20 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -513,6 +513,14 @@ test_expect_success 'log with multiple --author uses union' '
test_cmp expect actual
'
+test_expect_success 'log --all-match with multiple --author still uses union' '
+ git log --all-match --author="Thor" --author="Aster" --format=%s >actual &&
+ {
+ echo third && echo second && echo initial
+ } >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'log with --grep and multiple --author uses all-match' '
git log --author="Thor" --author="Night" --grep=i --format=%s >actual &&
{