From fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 2 Mar 2010 18:49:25 +0800 Subject: [PATCH] t5541-http-push: check that ref is unchanged for non-ff test Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano --- t/t5541-http-push.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 53f54a2789..ff947f3e4b 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' ' -- 2.11.4.GIT