diff options
| author | Christopher Tiwald <christiwald@gmail.com> | 2012-04-12 13:56:28 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-12 13:48:52 -0700 |
| commit | 0aff719f489771c5e52259394d011c51317b118f (patch) | |
| tree | 0c5f5b01f9df49e011ef2845d7ca9c714e7f6672 | |
| parent | e339aa92ae2db194a3d5738cb3aee6d8b3bf7b10 (diff) | |
| download | git-0aff719f489771c5e52259394d011c51317b118f.tar.gz git-0aff719f489771c5e52259394d011c51317b118f.tar.xz | |
Fix httpd tests that broke when non-ff push advice changed
Signed-off-by: Christopher Tiwald <christiwald@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-httpd.sh | 2 | ||||
| -rwxr-xr-x | t/t5541-http-push.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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 ' |