From: Christopher Tiwald Date: Thu, 12 Apr 2012 17:56:28 +0000 (-0400) Subject: Fix httpd tests that broke when non-ff push advice changed X-Git-Tag: v1.7.10.2~2^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0aff719f489771c5e52259394d011c51317b118f;p=git.git Fix httpd tests that broke when non-ff push advice changed Signed-off-by: Christopher Tiwald Signed-off-by: Junio C Hamano --- diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index f7dc0781d..094d49089 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -160,6 +160,6 @@ test_http_push_nonff() { ' 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 + test_i18ngrep "Updates were rejected because" output ' } diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index cc6f08171..57c3e48dd 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -167,7 +167,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 '