Merge branch 'jk/format-patch-quote-special-in-from' into maint

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 3f24384371bf227126e38da61f3b7efd3961ede8..d3829b8d0a18d15590f4cbde4606d130a9293ead 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -157,7 +157,7 @@ test_http_push_nonff() {
                grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
        '
 
-       test_expect_success 'non-fast-forward push shows help message' '
+       test_expect_success C_LOCALE_OUTPUT 'non-fast-forward push shows help message' '
                grep "To prevent you from losing history, non-fast-forward updates were rejected" \
                        output
        '