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 53f54a2789557bcfd4e9843b50fe28189fa6f356..ff947f3e4b4ec95bfa6f22ed68c181e1978261d1 100755 (executable)
--- 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' '
 '
 
 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 &&
 
        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 &&
        !(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' '
 '
 
 test_expect_success 'non-fast-forward push show ref status' '