Merge branch 'bc/maint-submodule-fix-parked' into maint

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 6f8a96cd809916c8edd007b2fe46a5e35ff58ca9..dd406c44b509895cac0af3bfa08654823636f78e 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -614,7 +614,7 @@ echo "fatal: --name-only does not make sense" > expect.name-only
 echo "fatal: --name-status does not make sense" > expect.name-status
 echo "fatal: --check does not make sense" > expect.check
 
-test_expect_success 'options no longer allowed for format-patch' '
+test_expect_success C_LOCALE_OUTPUT 'options no longer allowed for format-patch' '
        test_must_fail git format-patch --name-only 2> output &&
        test_cmp expect.name-only output &&
        test_must_fail git format-patch --name-status 2> output &&