From: Ævar Arnfjörð Bjarmason Date: Sun, 3 Apr 2011 13:33:39 +0000 (+0000) Subject: t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT X-Git-Tag: v1.7.5-rc1~10 X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=6b3d83efaceefdc198df270c7ad6e9fbf51c7537 t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT The t2019-checkout-ambiguous-ref.sh tests added in v1.7.4.3~12^2 examines the output for a translatable string, and must be marked with C_LOCALE_OUTPUT; otherwise, GETTEXT_POISON=YesPlease tests will break. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 943541d40..cc34e5535 100755 --- a/t/t2019-checkout-ambiguous-ref.sh +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -29,7 +29,7 @@ test_expect_success 'checkout chooses branch over tag' ' test_cmp expect file ' -test_expect_success 'checkout reports switch to branch' ' +test_expect_success C_LOCALE_OUTPUT 'checkout reports switch to branch' ' grep "Switched to branch" stderr && ! grep "^HEAD is now at" stderr ' @@ -51,7 +51,7 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' test_cmp expect file ' -test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' +test_expect_success VAGUENESS_SUCCESS,C_LOCALE_OUTPUT 'checkout reports switch to branch' ' grep "Switched to branch" stderr && ! grep "^HEAD is now at" stderr '