From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Nov 2008 06:26:24 +0000 (-0800)
Subject: Merge branch 'mk/maint-cg-push'
X-Git-Tag: v1.6.1-rc1~56
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3fdd37fe1520765d1d207737ab65415e3d2ca174;p=git.git

Merge branch 'mk/maint-cg-push'

* mk/maint-cg-push:
  git push: Interpret $GIT_DIR/branches in a Cogito compatible way

Conflicts:
	t/t5516-fetch-push.sh
---

3fdd37fe1520765d1d207737ab65415e3d2ca174
diff --cc t/t5516-fetch-push.sh
index a6532cb29,f9e878022..4426df922
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@@ -486,41 -494,54 +486,91 @@@ test_expect_success 'allow deleting an 
  
  '
  
 +test_expect_success 'warn on push to HEAD of non-bare repository' '
 +	mk_test heads/master
 +	(cd testrepo &&
 +		git checkout master &&
 +		git config receive.denyCurrentBranch warn) &&
 +	git push testrepo master 2>stderr &&
 +	grep "warning.*this may cause confusion" stderr
 +'
 +
 +test_expect_success 'deny push to HEAD of non-bare repository' '
 +	mk_test heads/master
 +	(cd testrepo &&
 +		git checkout master &&
 +		git config receive.denyCurrentBranch true) &&
 +	test_must_fail git push testrepo master
 +'
 +
 +test_expect_success 'allow push to HEAD of bare repository (bare)' '
 +	mk_test heads/master
 +	(cd testrepo &&
 +		git checkout master &&
 +		git config receive.denyCurrentBranch true &&
 +		git config core.bare true) &&
 +	git push testrepo master 2>stderr &&
 +	! grep "warning.*this may cause confusion" stderr
 +'
 +
 +test_expect_success 'allow push to HEAD of non-bare repository (config)' '
 +	mk_test heads/master
 +	(cd testrepo &&
 +		git checkout master &&
 +		git config receive.denyCurrentBranch false
 +	) &&
 +	git push testrepo master 2>stderr &&
 +	! grep "warning.*this may cause confusion" stderr
 +'
 +
+ test_expect_success 'fetch with branches' '
+ 	mk_empty &&
+ 	git branch second $the_first_commit &&
+ 	git checkout second &&
+ 	echo ".." > testrepo/.git/branches/branch1 &&
+ 	(cd testrepo &&
+ 		git fetch branch1 &&
+ 		r=$(git show-ref -s --verify refs/heads/branch1) &&
+ 		test "z$r" = "z$the_commit" &&
+ 		test 1 = $(git for-each-ref refs/heads | wc -l)
+ 	) &&
+ 	git checkout master
+ '
+ 
+ test_expect_success 'fetch with branches containing #' '
+ 	mk_empty &&
+ 	echo "..#second" > testrepo/.git/branches/branch2 &&
+ 	(cd testrepo &&
+ 		git fetch branch2 &&
+ 		r=$(git show-ref -s --verify refs/heads/branch2) &&
+ 		test "z$r" = "z$the_first_commit" &&
+ 		test 1 = $(git for-each-ref refs/heads | wc -l)
+ 	) &&
+ 	git checkout master
+ '
+ 
+ test_expect_success 'push with branches' '
+ 	mk_empty &&
+ 	git checkout second &&
+ 	echo "testrepo" > .git/branches/branch1 &&
+ 	git push branch1 &&
+ 	(cd testrepo &&
+ 		r=$(git show-ref -s --verify refs/heads/master) &&
+ 		test "z$r" = "z$the_first_commit" &&
+ 		test 1 = $(git for-each-ref refs/heads | wc -l)
+ 	)
+ '
+ 
+ test_expect_success 'push with branches containing #' '
+ 	mk_empty &&
+ 	echo "testrepo#branch3" > .git/branches/branch2 &&
+ 	git push branch2 &&
+ 	(cd testrepo &&
+ 		r=$(git show-ref -s --verify refs/heads/branch3) &&
+ 		test "z$r" = "z$the_first_commit" &&
+ 		test 1 = $(git for-each-ref refs/heads | wc -l)
+ 	) &&
+ 	git checkout master
+ '
+ 
  test_done