Re: [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

Hi Ævar,

On Thu, 23 Aug 2018, Ævar Arnfjörð Bjarmason wrote:

> 
> On Thu, Aug 23 2018, Johannes Schindelin via GitGitGadget wrote:
> 
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > A recently-added test case tries to verify that the output of `checkout
> > -p` contains a certain piece of advice.
> >
> > But if Git was built without Perl and therefore lacks support for `git
> > add -i`, the error output contains the hint that `-p` is not even
> > available instead.
> >
> > Let's just skip that test case altogether if Git was built with NO_PERL.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  t/t2024-checkout-dwim.sh | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
> > index 26dc3f1fc0..29e1e25300 100755
> > --- a/t/t2024-checkout-dwim.sh
> > +++ b/t/t2024-checkout-dwim.sh
> > @@ -76,7 +76,8 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
> >  	test_branch master
> >  '
> >
> > -test_expect_success 'checkout of branch from multiple remotes fails with advice' '
> > +test_expect_success NO_PERL \
> > +	'checkout of branch from multiple remotes fails with advice' '
> >  	git checkout -B master &&
> >  	test_might_fail git branch -D foo &&
> >  	test_must_fail git checkout foo 2>stderr &&
> 
> This issue is already fixed in master as 3338e9950e ("t2024: mark test
> using "checkout -p" with PERL prerequisite", 2018-08-18).

Excellent,
Dscho