diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2012-09-14 13:46:40 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-16 10:35:40 +0400 |
commit | dfe3642515d3d2679bdc25c2be4d961201e9f095 (patch) | |
tree | cbf5509491ffe3c7e3347da15ef3a6095397db29 /t/t7810-grep.sh | |
parent | b327bf74bd631790918d6730404eb97baec267c9 (diff) |
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>
Diffstat (limited to 't/t7810-grep.sh')
-rwxr-xr-x | t/t7810-grep.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 180e998697..b841909315 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -479,6 +479,22 @@ test_expect_success 'log grep (6)' ' 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' ' # grep matches initial and second but not third # author matches only initial and third |