Skip to content

Commit 273b0a1

Browse files
committed
Merge branch 'ab/checkout-default-remote'
* ab/checkout-default-remote: t2024: mark test using "checkout -p" with PERL prerequisite
2 parents d280170 + 3338e99 commit 273b0a1

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
@@ -86,8 +86,13 @@ test_expect_success 'checkout of branch from multiple remotes fails with advice'
8686
checkout foo 2>stderr &&
8787
test_branch master &&
8888
status_uno_is_clean &&
89-
test_i18ngrep ! "^hint: " stderr &&
90-
# Make sure the likes of checkout -p do not print this hint
89+
test_i18ngrep ! "^hint: " stderr
90+
'
91+
92+
test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
93+
git checkout -B master &&
94+
test_might_fail git branch -D foo &&
95+
9196
git checkout -p foo 2>stderr &&
9297
test_i18ngrep ! "^hint: " stderr &&
9398
status_uno_is_clean

0 commit comments

Comments
 (0)