Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint
* jc/t5516-pushInsteadOf-vs-pushURL: t5516: test interaction between pushURL and pushInsteadOf correctly
This commit is contained in:
commit
6a293703af
@ -230,10 +230,10 @@ test_expect_success 'push with pushInsteadOf' '
|
||||
|
||||
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
|
||||
mk_empty &&
|
||||
TRASH="$(pwd)/" &&
|
||||
git 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 "$TRASH/testrepo" &&
|
||||
git config remote.r.pushurl "testrepo/" &&
|
||||
git push r refs/heads/master:refs/remotes/origin/master &&
|
||||
(
|
||||
cd testrepo &&
|
||||
|
Loading…
Reference in New Issue
Block a user