summaryrefslogtreecommitdiff
path: root/t/t5541-http-push.sh
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2010-03-02 10:49:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-02 19:10:35 (GMT)
commitfe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73 (patch)
treed575bd957fd27d19251826a69be285d04f18d130 /t/t5541-http-push.sh
parente923eaeb901ff056421b9007adcbbce271caa7b6 (diff)
downloadgit-fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73.zip
git-fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73.tar.gz
git-fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73.tar.bz2
t5541-http-push: check that ref is unchanged for non-ff test
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5541-http-push.sh')
-rwxr-xr-xt/t5541-http-push.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 53f54a2..ff947f3 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -89,15 +89,17 @@ test_expect_success 'used receive-pack service' '
'
test_expect_success 'non-fast-forward push fails' '
+ cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
+ HEAD=$(git rev-parse --verify HEAD) &&
+
cd "$ROOT_PATH"/test_repo_clone &&
git checkout master &&
echo "changed" > path2 &&
git commit -a -m path2 --amend &&
- HEAD=$(git rev-parse --verify HEAD) &&
!(git push -v origin >output 2>&1) &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
- test $HEAD != $(git rev-parse --verify HEAD))
+ test $HEAD = $(git rev-parse --verify HEAD))
'
test_expect_success 'non-fast-forward push show ref status' '