From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 16:34:48 +0000 (-0700)
Subject: Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'
X-Git-Tag: v1.8.3-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41ae34d136e623cb4a6c6096d905dc648daabfb9

Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'

Update a test to match the documented interaction between pushURL
and pushInsteadOf.

* jc/t5516-pushInsteadOf-vs-pushURL:
t5516: test interaction between pushURL and pushInsteadOf correctly
---

41ae34d136e623cb4a6c6096d905dc648daabfb9
diff --cc t/t5516-fetch-push.sh
index 383a2eb1ea,9a21cd61d7..32ad89107b
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@@ -217,10 -230,10 +217,10 @@@ test_expect_success 'push with pushInst
  
  test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
  	mk_empty &&
- 	TRASH="$(pwd)/" &&
- 	test_config "url.trash2/.pushInsteadOf" trash/ &&
 -	git config "url.trash2/.pushInsteadOf" testrepo/ &&
 -	git config "url.trash3/.pusnInsteadOf" trash/wrong &&
 -	git config remote.r.url trash/wrong &&
 -	git config remote.r.pushurl "testrepo/" &&
++	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
++	test_config "url.trash3/.pusnInsteadOf" trash/wrong &&
 +	test_config remote.r.url trash/wrong &&
- 	test_config remote.r.pushurl "$TRASH/testrepo" &&
++	test_config remote.r.pushurl "testrepo/" &&
  	git push r refs/heads/master:refs/remotes/origin/master &&
  	(
  		cd testrepo &&