mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jc/t5516-pushInsteadOf-vs-pushURL:
  t5516: test interaction between pushURL and pushInsteadOf correctly
This commit is contained in:
Junio C Hamano
2013-04-12 13:41:45 -07:00
parent 41ccfdd9c9 c68c408a7a
commit 6a293703af
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t5516-fetch-push.sh
View File

@ -230,10 +230,10 @@ test_expect_success 'push with pushInsteadOf' '
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' ' test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
mk_empty && mk_empty &&
TRASH="$(pwd)/" && git config "url.trash2/.pushInsteadOf" testrepo/ &&
git config "url.trash2/.pushInsteadOf" trash/ && git config "url.trash3/.pusnInsteadOf" trash/wrong &&
git config remote.r.url trash/wrong && git config remote.r.url trash/wrong &&
git config remote.r.pushurl "$TRASH/testrepo" && git config remote.r.pushurl "testrepo/" &&
git push r refs/heads/master:refs/remotes/origin/master && git push r refs/heads/master:refs/remotes/origin/master &&
( (
cd testrepo && cd testrepo &&