diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-18 09:01:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-18 18:26:54 +0200 |
| commit | 3338e9950e353ffd2033aae25952eb3f88c315e1 (patch) | |
| tree | 37b09a7ddcbb92fc999e104e0d1acb412ce9e136 /t/t2024-checkout-dwim.sh | |
| parent | checkout & worktree: introduce checkout.defaultRemote (diff) | |
| download | git-3338e9950e353ffd2033aae25952eb3f88c315e1.tar.xz git-3338e9950e353ffd2033aae25952eb3f88c315e1.zip | |
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 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>
Diffstat (limited to '')
| -rwxr-xr-x | t/t2024-checkout-dwim.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index 26dc3f1fc0..d640e00e77 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -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 |