From: Tay Ray Chuan <rctay89@gmail.com>
Date: Tue, 2 Mar 2010 10:49:25 +0000 (+0800)
Subject: t5541-http-push: check that ref is unchanged for non-ff test
X-Git-Tag: v1.7.1-rc0~65^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73;p=git.git

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>
---

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 53f54a278..ff947f3e4 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' '