Skip to content

Commit 3338e99

Browse files
avargitster
authored andcommitted
t2024: mark test using "checkout -p" with PERL prerequisite
Checkout with the -p switch uses the "add interactive" framework which is written in Perl. One test added in 8d7b558 ("checkout & worktree: introduce checkout.defaultRemote", 2018-06-05) didn't declare the PERL prerequisite, breaking the test when built with NO_PERL. Reported-by: CB Bailey <[email protected]> Signed-off-by: CB Bailey <[email protected]> Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8d7b558 commit 3338e99

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

t/t2024-checkout-dwim.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,13 @@ test_expect_success 'checkout of branch from multiple remotes fails with advice'
8787
checkout foo 2>stderr &&
8888
test_branch master &&
8989
status_uno_is_clean &&
90-
test_i18ngrep ! "^hint: " stderr &&
91-
# Make sure the likes of checkout -p do not print this hint
90+
test_i18ngrep ! "^hint: " stderr
91+
'
92+
93+
test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
94+
git checkout -B master &&
95+
test_might_fail git branch -D foo &&
96+
9297
git checkout -p foo 2>stderr &&
9398
test_i18ngrep ! "^hint: " stderr &&
9499
status_uno_is_clean

0 commit comments

Comments
 (0)