From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:48:34 +0000 (-0700)
Subject: Merge branch 'nd/fetch-ref-summary'
X-Git-Tag: v2.10.0-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/abbf7bd495aadab375f50a69af2310cc6acf2867?ds=inline;hp=-c

Merge branch 'nd/fetch-ref-summary'

Hotfix of a test in a topic that has already been merged to 'master'.

* nd/fetch-ref-summary:
t5510: skip tests under GETTEXT_POISON build
---

abbf7bd495aadab375f50a69af2310cc6acf2867
diff --combined t/t5510-fetch.sh
index 6bd4853079,6aa63b1e74..668c54be41
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@@ -644,7 -644,7 +644,7 @@@ test_expect_success 'fetch --prune prin
  		git fetch --prune origin 2>&1 | head -n1 >../actual
  	) &&
  	echo "From ${D}/." >expect &&
 -	test_cmp expect actual
 +	test_i18ncmp expect actual
  '
  
  test_expect_success 'branchname D/F conflict resolved by --prune' '
@@@ -688,7 -688,7 +688,7 @@@ test_expect_success 'fetching with auto
  	)
  '
  
- test_expect_success 'fetch aligned output' '
+ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
  	git clone . full-output &&
  	test_commit looooooooooooong-tag &&
  	(
@@@ -703,7 -703,7 +703,7 @@@
  	test_cmp expect actual
  '
  
- test_expect_success 'fetch compact output' '
+ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
  	git clone . compact &&
  	test_commit extraaa &&
  	(