summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-20 22:50:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-20 22:50:37 (GMT)
commitc5da24a73a96a9908ae715f6430e65294115646a (patch)
tree4db197f483c8fd331cc149869da44d02c9ecacb2 /t
parentaf78c317205ce254d9cc75fc0298ee86b579de73 (diff)
parent0aff719f489771c5e52259394d011c51317b118f (diff)
downloadgit-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')
-rw-r--r--t/lib-httpd.sh2
-rwxr-xr-xt/t5541-http-push.sh2
2 files changed, 2 insertions, 2 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
'
}
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index d7964c7..5b170be 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
'