Re: [PATCHv3 11/11] t7810-grep: test --all-match with multiple --grep and --author options
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 14, 2012, 18:01 UTC
- Message-ID
- <7vtxv04h7e.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <155f30ede8a788c599189af677936b15fabf041b.1347615361.git.git@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
> --all-match is ignored with multiple author options on purpose but > requires all --grep to be matched on some line.
It is more like "the behaviour of --all-match to tie more than one --grep used to be broken when --author or --committer is used".
Show 44 quoted lines
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> t/t7810-grep.sh | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
> index f6edb4d..b5c488e 100755
> --- a/t/t7810-grep.sh
> +++ b/t/t7810-grep.sh
> @@ -531,6 +531,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
> @@ -541,6 +551,16 @@ test_expect_success 'log --grep --author --author takes union of authors and int
> test_cmp expect actual
> '
>
> +test_expect_success '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 &&