]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t2024: mark test using "checkout -p" with PERL prerequisite
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 18 Aug 2018 07:01:47 +0000 (07:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Aug 2018 16:26:54 +0000 (09:26 -0700)
Checkout with the -p switch uses the "add interactive" framework which
is written in Perl.

One test added in 8d7b558bae ("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 <cb@hashpling.org>
Signed-off-by: CB Bailey <cb@hashpling.org>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2024-checkout-dwim.sh

index 26dc3f1fc0c25df1b359b5d56aece9f171344f5a..d640e00e77ce0733fa5bc78342d2f1db37eb0e6a 100755 (executable)
@@ -87,8 +87,13 @@ test_expect_success 'checkout of branch from multiple remotes fails with advice'
                checkout foo 2>stderr &&
        test_branch master &&
        status_uno_is_clean &&
-       test_i18ngrep ! "^hint: " stderr &&
-       # Make sure the likes of checkout -p do not print this hint
+       test_i18ngrep ! "^hint: " stderr
+'
+
+test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
+       git checkout -B master &&
+       test_might_fail git branch -D foo &&
+
        git checkout -p foo 2>stderr &&
        test_i18ngrep ! "^hint: " stderr &&
        status_uno_is_clean