From: Tay Ray Chuan <rctay89@gmail.com>
Date: Fri, 8 Jan 2010 02:12:40 +0000 (+0800)
Subject: t5541-http-push.sh: add tests for non-fast-forward pushes
X-Git-Tag: v1.7.0-rc0~74^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1945237486851bc3a0c6d65eaeb21cb22cac2ea1;p=git.git

t5541-http-push.sh: add tests for non-fast-forward pushes

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 2a58d0cc9..f49c7c417 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -88,5 +88,28 @@ test_expect_success 'used receive-pack service' '
 	test_cmp exp act
 '
 
+test_expect_success 'non-fast-forward push fails' '
+	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_expect_failure 'non-fast-forward push show ref status' '
+	grep "^ ! \[rejected\][ ]*master -> master (non-fast-forward)$" output
+'
+
+test_expect_failure 'non-fast-forward push shows help message' '
+	grep \
+"To prevent you from losing history, non-fast-forward updates were rejected
+Merge the remote changes before pushing again.  See the '"'non-fast-forward'"'
+section of '"'git push --help'"' for details." output
+'
+
 stop_httpd
 test_done