From: Tay Ray Chuan Date: Tue, 02 Mar 2010 10:49:25 GMT Subject: [PATCH v2 1/7] t5541-http-push: check that ref is unchanged for non-ff test Message-ID: <1267526971-5552-2-git-send-email-rctay89@gmail.com> In-Reply-To: <1267526971-5552-1-git-send-email-rctay89@gmail.com> Signed-off-by: Tay Ray Chuan --- t/t5541-http-push.sh | 6 ++++-- 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' ' -- 1.7.0.26.gbfa16