summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-20 08:14:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-20 08:14:46 (GMT)
commit030a360849e9cb2b3c408cbf9d8c980f3aae5868 (patch)
tree36a3f3b6bce4049d4df900324caa0a17df475b2b
parentabce5decd8bf4fc912ced12054790ce6917560cf (diff)
parentd202a513a4d377d3ea319bb1c5c7ae0548a3b581 (diff)
downloadgit-030a360849e9cb2b3c408cbf9d8c980f3aae5868.zip
git-030a360849e9cb2b3c408cbf9d8c980f3aae5868.tar.gz
git-030a360849e9cb2b3c408cbf9d8c980f3aae5868.tar.bz2
Merge branch 'cb/maint-t5541-make-server-port-portable'
* cb/maint-t5541-make-server-port-portable: t5541: check error message against the real port number used
-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 d66ed24..cc6f081 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -106,7 +106,7 @@ 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'
+error: failed to push some refs to 'http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git'
EOF
test_expect_success 'rejected update prints status' '