Merge branch 'jn/block-sha1' into maint

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 1f5bfa2d063b41d8eece768946b6143ea57f287a..312e484090d1ceb392399768f2229ae553182fe7 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -168,7 +168,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
 '
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
-       test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
+       test_i18ngrep "Updates were rejected because" \
                output
 '