diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:53:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:53:46 -0700 |
| commit | 273b0a1f5888ace60a95bf7276f88f70a5581b94 (patch) | |
| tree | fe9cd029b7d0eabe8e7b7b5d3a92f5c83da10458 | |
| parent | Merge branch 'hn/highlight-sideband-keywords' (diff) | |
| parent | t2024: mark test using "checkout -p" with PERL prerequisite (diff) | |
| download | git-273b0a1f5888ace60a95bf7276f88f70a5581b94.tar.gz git-273b0a1f5888ace60a95bf7276f88f70a5581b94.zip | |
Merge branch 'ab/checkout-default-remote'
* ab/checkout-default-remote:
t2024: mark test using "checkout -p" with PERL prerequisite
| -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 f79dfbbdd6..69b6774d10 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -86,8 +86,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 |