Merge v1.7.5-rc2 into jn/format-patch-doc

diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index 943541d40d7ea331dd0ae85624a33b9f2258246c..cc34e5535bc5ab7441ba375540e5feec2dfb2d6b 100755 (executable)
--- 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
 '