From: Michael J Gruber Date: Thu, 13 Sep 2012 14:04:43 GMT Subject: [PATCHv2 5/6] t7810-grep: test --all-match with multiple --grep and --author options Message-ID: In-Reply-To: <7v7grzdue6.fsf@alter.siamese.dyndns.org> --all-match is ignored with multiple author options on purpose. It is also ignored with multiple --grep options when an --author option is present. Mark this as known failure. Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index f98f3f6..fa2845f 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -598,6 +598,16 @@ test_expect_success 'log --grep --grep --author takes union of greps and interse test_cmp expect actual ' +test_expect_success 'log ---all-match -grep --author --author still takes union of authors and intersects with grep' ' + # grep matches only initial and third + # author matches all but second + git log --all-match --author="Thor" --author="Night" --grep=i --format=%s >actual && + { + echo third && echo initial + } >expect && + test_cmp expect actual +' + test_expect_success 'log --grep --author --author takes union of authors and intersects with grep' ' # grep matches only initial and third # author matches all but second @@ -608,6 +618,16 @@ test_expect_success 'log --grep --author --author takes union of authors and int test_cmp expect actual ' +test_expect_failure 'log --all-match --grep --grep --author takes intersection' ' + # grep matches only third + # author matches only initial and third + git log --all-match --author="A U Thor" --grep=i --grep=r --format=%s >actual && + { + echo third + } >expect && + test_cmp expect actual +' + test_expect_success 'grep with CE_VALID file' ' git update-index --assume-unchanged t/t && rm t/t && -- 1.7.12.463.gbd9d638