[PATCH] t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Apr 3, 2011, 13:33 UTC
- Message-ID
- <1301837619-20277-1-git-send-email-avarab@gmail.com>
The t2019-checkout-ambiguous-ref.sh tests added by Junio in v1.7.4.3~12^2 broke on Git built with GETTEXT_POISON=YesPlease. Add C_LOCALE_OUTPUT to the relevant test files to fix this.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t2019-checkout-ambiguous-ref.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 943541d..cc34e55 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 '
-- 1.7.4.1