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>
Christopher Tiwald committed
Apr 12, 2012 at 13:56 UTC
0aff719f489771c5e52259394d011c51317b118f
2 files changed
+2
-2
t/lib-httpd.sh
+1
-1
@@ -160,6 +160,6 @@ test_http_push_nonff() {
160
'
161
162
test_expect_success 'non-fast-forward push shows help message' '
163
- test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output
163
+ test_i18ngrep "Updates were rejected because" output
164
'
165
}
t/t5541-http-push.sh
+1
-1
@@ -167,7 +167,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
167
'
168
169
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
170
- test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
170
+ test_i18ngrep "Updates were rejected because" \
171
output
172
'
173