summaryrefslogtreecommitdiff
path: root/t/t5541-http-push.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 18:18:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-11 18:18:43 (GMT)
commit07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (patch)
treebe3f24134f5956774c7d5407231a31bab33d5616 /t/t5541-http-push.sh
parent9a10117560316ed22099f74583e56c1cc7c41394 (diff)
parent0aff719f489771c5e52259394d011c51317b118f (diff)
downloadgit-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.zip
git-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.gz
git-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.bz2
Merge branch 'ct/advise-push-default' into maint
The cases "git push" fails due to non-ff can be broken into three categories; each case is given a separate advise message. 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/t5541-http-push.sh')
-rwxr-xr-xt/t5541-http-push.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 1f5bfa2..312e484 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -168,7 +168,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
'