summaryrefslogtreecommitdiff
path: root/t/t5541-http-push.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 21:18:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-29 21:18:54 (GMT)
commit2bbf77dde2b47f2b8c9769c4d64f7f2f591d1e99 (patch)
treeb329ea0a49dac95102679bdceb8cd2a1f58ca5ca /t/t5541-http-push.sh
parent731218c18f493cc6c6e3fc22be837e49e5399768 (diff)
parent5238cbf65638d7a097bdb5ca8226f5acbe31f143 (diff)
downloadgit-2bbf77dde2b47f2b8c9769c4d64f7f2f591d1e99.zip
git-2bbf77dde2b47f2b8c9769c4d64f7f2f591d1e99.tar.gz
git-2bbf77dde2b47f2b8c9769c4d64f7f2f591d1e99.tar.bz2
Merge branch 'sp/smart-http-failure-to-push'
* sp/smart-http-failure-to-push: remote-curl: Fix push status report when all branches fail
Diffstat (limited to 't/t5541-http-push.sh')
-rwxr-xr-xt/t5541-http-push.sh28
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 6c9ec6f..d66ed24 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -96,6 +96,32 @@ test_expect_success 'create and delete remote branch' '
test_must_fail git show-ref --verify refs/remotes/origin/dev
'
+cat >"$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" <<EOF
+#!/bin/sh
+exit 1
+EOF
+chmod a+x "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
+
+cat >exp <<EOF
+remote: error: hook declined to update refs/heads/dev2
+To http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git
+ ! [remote rejected] dev2 -> dev2 (hook declined)
+error: failed to push some refs to 'http://127.0.0.1:5541/smart/test_repo.git'
+EOF
+
+test_expect_success 'rejected update prints status' '
+ cd "$ROOT_PATH"/test_repo_clone &&
+ git checkout -b dev2 &&
+ : >path4 &&
+ git add path4 &&
+ test_tick &&
+ git commit -m dev2 &&
+ test_must_fail git push origin dev2 2>act &&
+ sed -e "/^remote: /s/ *$//" <act >cmp &&
+ test_cmp exp cmp
+'
+rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
+
cat >exp <<EOF
GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
@@ -107,6 +133,8 @@ GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
+GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
+POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
EOF
test_expect_success 'used receive-pack service' '
sed -e "