mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
e339aa92ae
commit
0aff719f48
|
@ -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
|
||||
'
|
||||
}
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue