Skip to content

Commit 41ae34d

Browse files
committed
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
2 parents e3b1173 + c68c408 commit 41ae34d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t5516-fetch-push.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ test_expect_success 'push with pushInsteadOf' '
217217

218218
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
219219
mk_empty &&
220-
TRASH="$(pwd)/" &&
221-
test_config "url.trash2/.pushInsteadOf" trash/ &&
220+
test_config "url.trash2/.pushInsteadOf" testrepo/ &&
221+
test_config "url.trash3/.pusnInsteadOf" trash/wrong &&
222222
test_config remote.r.url trash/wrong &&
223-
test_config remote.r.pushurl "$TRASH/testrepo" &&
223+
test_config remote.r.pushurl "testrepo/" &&
224224
git push r refs/heads/master:refs/remotes/origin/master &&
225225
(
226226
cd testrepo &&

0 commit comments

Comments
 (0)