diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-08-30 13:54:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-30 10:40:48 -0700 |
| commit | 64ec8efb836c5def807feb5d86be50f4f53a7b33 (patch) | |
| tree | c6efe9ea1f0381b78759911a8c49d0082fdb8559 | |
| parent | 75247802550185d844212df7911dc5f462ac7713 (diff) | |
| download | git-64ec8efb836c5def807feb5d86be50f4f53a7b33.tar.xz | |
t6132(NO_PERL): do not run the scripted `add -p`
When using the non-built-in version of `git add -p` in a `NO_PERL`
build, we expect that invocation to fail.
However, when b02fdbc80a4 (pathspec: correct an empty string used as a
pathspec element, 2022-05-29) added a test case to t6132 to exercise
`git add -p`, it did not add appropriate prereqs (which admittedly did
not exist back then).
Let's specify the appropriate prereqs.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6132-pathspec-exclude.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh index 9fdafeb1e9..cada952f9a 100755 --- a/t/t6132-pathspec-exclude.sh +++ b/t/t6132-pathspec-exclude.sh @@ -293,7 +293,11 @@ test_expect_success 'add with all negative' ' test_cmp expect actual ' -test_expect_success 'add -p with all negative' ' +test_lazy_prereq ADD_I_USE_BUILTIN_OR_PERL ' + test_have_prereq ADD_I_USE_BUILTIN || test_have_prereq PERL +' + +test_expect_success ADD_I_USE_BUILTIN_OR_PERL 'add -p with all negative' ' H=$(git rev-parse HEAD) && git reset --hard $H && git clean -f && |