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?hp=612c3dfb06675bf65831a7eb8b51ecc57224f5ef

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
---

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 6bd4853079..668c54be41 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -688,7 +688,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
 	)
 '
 
-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 @@ test_expect_success 'fetch aligned output' '
 	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 &&
 	(