Re: [PATCH v2 08/22] pickaxe tests: test for -G, -S and --find-object incompatibility
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 30, 2021, 23:32 UTC
- Message-ID
- <xmqq1rbwb4lm.fsf@gitster.g>
- In-Reply-To
- <20210216115801.4773-9-avarab@gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 26 quoted lines
> Add a test for the options sanity check added in 5e505257f2 (diff: > properly error out when combining multiple pickaxe options, > 2018-01-04). > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> > --- > t/t4209-log-pickaxe.sh | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh > index c6b4751d5b6..5ad4fad964c 100755 > --- a/t/t4209-log-pickaxe.sh > +++ b/t/t4209-log-pickaxe.sh > @@ -55,6 +55,17 @@ test_expect_success setup ' > git rev-parse --verify HEAD >expect_second > ' > > +test_expect_success 'usage' ' > + test_expect_code 128 git log -Gregex -Sstring 2>err && > + test_i18ngrep "mutually exclusive" err && > + > + test_expect_code 128 git log -Gregex --find-object=HEAD 2>err && > + test_i18ngrep "mutually exclusive" err && > + > + test_expect_code 128 git log -Gstring --find-object=HEAD 2>err && > + test_i18ngrep "mutually exclusive" err
Didn't you mean -Sstring for the third one? Otherwise we'd be testing -G/--find-object combination twice.
Show 5 quoted lines
> +' > + > test_log expect_initial --grep initial > test_log expect_nomatch --grep InItial > test_log_icase expect_initial --grep InItial