From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 19:53:46 +0000 (-0700)
Subject: Merge branch 'ab/checkout-default-remote'
X-Git-Tag: v2.19.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/273b0a1f5888ace60a95bf7276f88f70a5581b94?hp=-c

Merge branch 'ab/checkout-default-remote'

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

273b0a1f5888ace60a95bf7276f88f70a5581b94
diff --combined t/t2024-checkout-dwim.sh
index f79dfbbdd6,d640e00e77..69b6774d10
--- a/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