"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Johannes Schindelin <johannes.schindelin@xxxxxx> > > The scripted version of the interactive mode of `git add` still requires > Perl, but the built-in version does not. Let's only require the PERL > prereq if testing the scripted version. > > This addresses a long-standing NEEDSWORK added in 35166b1fb54 (t2016: > add a NEEDSWORK about the PERL prerequisite, 2020-10-07). > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > --- > t/t2016-checkout-patch.sh | 42 ++++++++++++++++++++------------------- > 1 file changed, 22 insertions(+), 20 deletions(-) Good. I suspect there may not be too many developers who lack PERL prerequisite around here, so it is not like the built-in version was not sufficiently tested in developers' environment without this patch, but it is nice to see us move in this direction. Of course, when we remove the non-builtin version, we'd further be able to lose these prerequisites. > diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh > index abfd586c32b..71c5a15be00 100755 > --- a/t/t2016-checkout-patch.sh > +++ b/t/t2016-checkout-patch.sh > @@ -4,7 +4,13 @@ test_description='git checkout --patch' > > . ./lib-patch-mode.sh > > -test_expect_success PERL 'setup' ' > +if ! test_bool_env GIT_TEST_ADD_I_USE_BUILTIN false && ! test_have_prereq PERL > +then > + skip_all='skipping interactive add tests, PERL not set' > + test_done > +fi > + > +test_expect_success 'setup' ' > mkdir dir && > echo parent > dir/foo && > echo dummy > bar && > @@ -18,44 +24,40 @@ test_expect_success PERL 'setup' ' > > # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar' > > -# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN > -# is given, we should replace the PERL prerequisite with an ADD_I prerequisite > -# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking > -# PERL. > -test_expect_success PERL 'saying "n" does nothing' ' > +test_expect_success 'saying "n" does nothing' '
