summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:35 (GMT)
commitabbf7bd495aadab375f50a69af2310cc6acf2867 (patch)
treef7b66d38852f561241860c6961b499bc3ecb9156 /t
parent612c3dfb06675bf65831a7eb8b51ecc57224f5ef (diff)
parent377d7ded18f24cf6e2b7d32cbe44a6ed7b6a5574 (diff)
downloadgit-abbf7bd495aadab375f50a69af2310cc6acf2867.zip
git-abbf7bd495aadab375f50a69af2310cc6acf2867.tar.gz
git-abbf7bd495aadab375f50a69af2310cc6acf2867.tar.bz2
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
Diffstat (limited to 't')
-rwxr-xr-xt/t5510-fetch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 6bd4853..668c54b 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 &&
(