Skip to content

Commit

Permalink
Fix httpd tests that broke when non-ff push advice changed
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Tiwald <christiwald@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christopher Tiwald authored and Junio C Hamano committed Apr 12, 2012
1 parent e339aa9 commit 0aff719
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion t/lib-httpd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
}
2 changes: 1 addition & 1 deletion t/t5541-http-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

Expand Down

0 comments on commit 0aff719

Please sign in to comment.