mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 01:06:12 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2013-04-03 09:34:48 -07:00
parent e3b1173fb1 c68c408a7a
commit 41ae34d136
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,10 +217,10 @@ test_expect_success 'push with pushInsteadOf' '
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
mk_empty &&
TRASH="$(pwd)/" &&
test_config "url.trash2/.pushInsteadOf" trash/ &&
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 &&