Merge branch 'zj/send-email-authen-sasl'

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