diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-20 22:50:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-20 22:50:37 (GMT) |
| commit | c5da24a73a96a9908ae715f6430e65294115646a (patch) | |
| tree | 4db197f483c8fd331cc149869da44d02c9ecacb2 /t/lib-httpd.sh | |
| parent | af78c317205ce254d9cc75fc0298ee86b579de73 (diff) | |
| parent | 0aff719f489771c5e52259394d011c51317b118f (diff) | |
| download | git-c5da24a73a96a9908ae715f6430e65294115646a.zip git-c5da24a73a96a9908ae715f6430e65294115646a.tar.gz git-c5da24a73a96a9908ae715f6430e65294115646a.tar.bz2 | |
Merge branch 'ct/advise-push-default'
Break down the cases in which "git push" fails due to non-ff into
three categories, and give separate advise messages for each case.
By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
Fix httpd tests that broke when non-ff push advice changed
clean up struct ref's nonfastforward field
push: Provide situational hints for non-fast-forward errors
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index f7dc078..094d490 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 ' } |