X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft5516-fetch-push.sh;h=86f9b5346a0d7d8807d8c37c063690540873813a;hb=09fba7a59d38d1cafaf33eadaf1d409c4113b30c;hp=c0fa2ba404a7772af07d8546a51b05bd9b17ec2c;hpb=1a6f3999998a22325ff820bf8c840e3baf3d2281;p=git.git

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index c0fa2ba40..86f9b5346 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -11,7 +11,8 @@ mk_empty () {
 	mkdir testrepo &&
 	(
 		cd testrepo &&
-		git init
+		git init &&
+		mv .git/hooks .git/hooks-disabled
 	)
 }
 
@@ -243,4 +244,42 @@ test_expect_success 'push with colon-less refspec (4)' '
 
 '
 
+test_expect_success 'push with dry-run' '
+
+	mk_test heads/master &&
+	cd testrepo &&
+	old_commit=$(git show-ref -s --verify refs/heads/master) &&
+	cd .. &&
+	git push --dry-run testrepo &&
+	check_push_result $old_commit heads/master
+'
+
+test_expect_success 'push updates local refs' '
+
+	rm -rf parent child &&
+	mkdir parent && cd parent && git init &&
+		echo one >foo && git add foo && git commit -m one &&
+	cd .. &&
+	git clone parent child && cd child &&
+		echo two >foo && git commit -a -m two &&
+		git push &&
+	test $(git rev-parse master) = $(git rev-parse remotes/origin/master)
+
+'
+
+test_expect_success 'push does not update local refs on failure' '
+
+	rm -rf parent child &&
+	mkdir parent && cd parent && git init &&
+		echo one >foo && git add foo && git commit -m one &&
+		echo exit 1 >.git/hooks/pre-receive &&
+		chmod +x .git/hooks/pre-receive &&
+	cd .. &&
+	git clone parent child && cd child &&
+		echo two >foo && git commit -a -m two || exit 1
+		git push && exit 1
+	test $(git rev-parse master) != $(git rev-parse remotes/origin/master)
+
+'
+
 test_done