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

diff --cc t/t5516-fetch-push.sh
index 383a2eb1eaa46053fc3a91fb44921aea2f04637a,9a21cd61d7c5efa13990e474d6c5f1ba0e939b71..32ad89107b20fc2187b416bc7e3f4d45e17474c6
--- 1/t/t5516-fetch-push.sh
--- 2/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 &&