Merge branch 'ab/checkout-default-remote'

* ab/checkout-default-remote:
t2024: mark test using "checkout -p" with PERL prerequisite

diff --combined t/t2024-checkout-dwim.sh
index f79dfbbdd693b3fd7443d3c839e86e627663eb4b,d640e00e77ce0733fa5bc78342d2f1db37eb0e6a..69b6774d10a9d90790316e9feb0f718593465c76
--- 1/t/t2024-checkout-dwim.sh
--- 2/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@@ -24,8 -24,9 +24,8 @@@ test_branch_upstream () 
  }
  
  status_uno_is_clean () {
 -      >status.expect &&
        git status -uno --porcelain >status.actual &&
 -      test_cmp status.expect status.actual
 +      test_must_be_empty status.actual
  }
  
  test_expect_success 'setup' '
@@@ -86,8 -87,13 +86,13 @@@ test_expect_success 'checkout of branc
                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