git push currently doesn't consider pushInsteadOf when
using pushurl; this test tests that.

If you use pushurl with an alias that has a pushInsteadOf configuration
value, Git does not take advantage of it.  For example:

[url "git://github.com/"]
    insteadOf = github:
[url "git://github.com/myuser/"]
    insteadOf = mygithub:
[url "g...@github.com:myuser/"]
    pushInsteadOf = mygithub:
[remote "origin"]
    url     = github:organization/project
    pushurl = mygithub:project

With the above configuration, the following occurs:

$ git push origin master
fatal: remote error:
  You can't push to git://github.com/myuser/project.git
  Use g...@github.com:myuser/project.git

So you can see that pushurl is being followed (it's not attempting to
push to git://github.com/organization/project), but insteadOf values are
being used as opposed to pushInsteadOf values for expanding the pushurl
alias.

This commit fixes that.

Signed-off-by: Rob Hoelz <r...@hoelz.ro>
---
 remote.c              |  2 +-
 t/t5516-fetch-push.sh | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/remote.c b/remote.c
index ca1f8f2..de7a915 100644
--- a/remote.c
+++ b/remote.c
@@ -465,7 +465,7 @@ static void alias_all_urls(void)
                if (!remotes[i])
                        continue;
                for (j = 0; j < remotes[i]->pushurl_nr; j++) {
-                       remotes[i]->pushurl[j] = 
alias_url(remotes[i]->pushurl[j], &rewrites);
+                       remotes[i]->pushurl[j] = 
alias_url(remotes[i]->pushurl[j], &rewrites_push);
                }
                add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
                for (j = 0; j < remotes[i]->url_nr; j++) {
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index b5417cc..709f506 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -244,6 +244,87 @@ test_expect_success 'push with pushInsteadOf and explicit 
pushurl (pushInsteadOf
        )
 '
 
+test_expect_success 'push with pushInsteadOf and explicit pushurl (pushurl + 
pushInsteadOf does rewrite in this case)' '
+       mk_empty &&
+       rm -rf ro rw &&
+       TRASH="$(pwd)/" &&
+       mkdir ro &&
+       mkdir rw &&
+       git init --bare rw/testrepo &&
+       git config "url.file://$TRASH/ro/.insteadOf" ro: &&
+       git config "url.file://$TRASH/rw/.pushInsteadOf" rw: &&
+       git config remote.r.url ro:wrong &&
+       git config remote.r.pushurl rw:testrepo &&
+       git push r refs/heads/master:refs/remotes/origin/master &&
+       (
+               cd rw/testrepo &&
+               r=$(git show-ref -s --verify refs/remotes/origin/master) &&
+               test "z$r" = "z$the_commit" &&
+
+               test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
+       )
+'
+
+test_expect_success 'push without pushInsteadOf and explicit pushurl (pushurl 
+ insteadOf is used for rewrite)' '
+       mk_empty &&
+       rm -rf ro rw &&
+       TRASH="$(pwd)/" &&
+       mkdir ro &&
+       mkdir rw &&
+       git init --bare rw/testrepo &&
+       git config "url.file://$TRASH/ro/.insteadOf" ro: &&
+       git config "url.file://$TRASH/rw/.insteadOf" rw: &&
+       git config remote.r.url ro:wrong &&
+       git config remote.r.pushurl rw:testrepo &&
+       git push r refs/heads/master:refs/remotes/origin/master &&
+       (
+               cd rw/testrepo &&
+               r=$(git show-ref -s --verify refs/remotes/origin/master) &&
+               test "z$r" = "z$the_commit" &&
+
+               test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
+       )
+'
+
+test_expect_success 'push with pushInsteadOf but without explicit pushurl (url 
+ pushInsteadOf is used for rewrite)' '
+       mk_empty &&
+       rm -rf ro rw &&
+       TRASH="$(pwd)/" &&
+       mkdir ro &&
+       mkdir rw &&
+       git init --bare rw/testrepo &&
+       git config "url.file://$TRASH/ro/.insteadOf" rw: &&
+       git config "url.file://$TRASH/rw/.pushInsteadOf" rw: &&
+       git config remote.r.url rw:testrepo &&
+       git push r refs/heads/master:refs/remotes/origin/master &&
+       (
+               cd rw/testrepo &&
+               r=$(git show-ref -s --verify refs/remotes/origin/master) &&
+               test "z$r" = "z$the_commit" &&
+
+               test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
+       )
+'
+
+test_expect_success 'push without pushInsteadOf and without explicit pushurl 
(url + insteadOf is used for rewrite)' '
+       mk_empty &&
+       rm -rf ro rw &&
+       TRASH="$(pwd)/" &&
+       mkdir ro &&
+       mkdir rw &&
+       git init --bare rw/testrepo &&
+       git config "url.file://$TRASH/ro/.insteadOf" rw: &&
+       git config remote.r.url rw:testrepo &&
+       git push r refs/heads/master:refs/remotes/origin/master &&
+       (
+               cd rw/testrepo &&
+               r=$(git show-ref -s --verify refs/remotes/origin/master) &&
+               test "z$r" = "z$the_commit" &&
+
+               test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
+       )
+'
+
 test_expect_success 'push with matching heads' '
 
        mk_test heads/master &&
-- 
1.8.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to