t7810-grep: test multiple --grep with and without --all-match

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2012-09-14 11:46:40 +02:00 committed by Junio C Hamano
parent b327bf74bd
commit dfe3642515

View File

@ -479,6 +479,22 @@ test_expect_success 'log grep (6)' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'log with multiple --grep uses union' '
git log --grep=i --grep=r --format=%s >actual &&
{
echo fourth && echo third && echo initial
} >expect &&
test_cmp expect actual
'
test_expect_success 'log --all-match with multiple --grep uses intersection' '
git log --all-match --grep=i --grep=r --format=%s >actual &&
{
echo third
} >expect &&
test_cmp expect actual
'
test_expect_success 'log --grep --author implicitly uses all-match' ' test_expect_success 'log --grep --author implicitly uses all-match' '
# grep matches initial and second but not third # grep matches initial and second but not third
# author matches only initial and third # author matches only initial and third