Fix issue #21773

When using `LibGit2.set_remote_url` to specify a GitHub HTTP URL only the fetch URL would be modified to use HTTP and the push URL would always be set to SSH.
JuliaLang · Jun 6, 2017 · d4a43e4 · d4a43e4
1 parent 80369bf
commit d4a43e4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/base/libgit2/libgit2.jl b/base/libgit2/libgit2.jl
@@ -260,14 +260,7 @@ LibGit2.set_remote_url(repo_path, url2, remote="upstream2")
 function set_remote_url(repo::GitRepo, url::AbstractString; remote::AbstractString="origin")
     with(GitConfig, repo) do cfg
         set!(cfg, "remote.$remote.url", url)
-
-        m = match(GITHUB_REGEX,url)
-        if m !== nothing
-            push = "[email protected]:$(m.captures[1]).git"
-            if push != url
-                set!(cfg, "remote.$remote.pushurl", push)
-            end
-        end
+        set!(cfg, "remote.$remote.pushurl", url)
     end
 end
 

diff --git a/base/libgit2/remote.jl b/base/libgit2/remote.jl
@@ -74,18 +74,18 @@ end
 """
     url(rmt::GitRemote)
 
-Get the URL of a remote git repository.
+Get the fetch URL of a remote git repository.
 
 # Example
 
 ```julia-repl
 julia> repo_url = "https://github.com/JuliaLang/Example.jl";
 
-julia> repo = LibGit2.clone(cache_repo, "test_directory");
+julia> repo = LibGit2.init(mktempdir());
 
 julia> remote = LibGit2.GitRemote(repo, "origin", repo_url);
 
-julia> url(remote)
+julia> LibGit2.url(remote)
 "https://github.com/JuliaLang/Example.jl"
 ```
 """
@@ -95,6 +95,17 @@ function url(rmt::GitRemote)
     return unsafe_string(url_ptr)
 end
 
+"""
+    push_url(rmt::GitRemote)
+
+Get the push URL of a remote git repository.
+"""
+function push_url(rmt::GitRemote)
+    url_ptr = ccall((:git_remote_pushurl, :libgit2), Cstring, (Ptr{Void},), rmt.ptr)
+    url_ptr == C_NULL && return ""
+    return unsafe_string(url_ptr)
+end
+
 """
     name(rmt::GitRemote)
 

diff --git a/test/libgit2.jl b/test/libgit2.jl
@@ -252,16 +252,21 @@ mktempdir() do dir
 
                 remote = LibGit2.get(LibGit2.GitRemote, repo, branch)
                 @test LibGit2.url(remote) == repo_url
+                @test LibGit2.push_url(remote) == ""
                 @test LibGit2.name(remote) == "upstream"
                 @test isa(remote, LibGit2.GitRemote)
                 @test sprint(show, remote) == "GitRemote:\nRemote name: upstream url: $repo_url"
                 @test LibGit2.isattached(repo)
                 LibGit2.set_remote_url(repo, "", remote="upstream")
                 remote = LibGit2.get(LibGit2.GitRemote, repo, branch)
+                @test LibGit2.url(remote) == ""
+                @test LibGit2.push_url(remote) == ""
                 @test sprint(show, remote) == "GitRemote:\nRemote name: upstream url: "
                 close(remote)
                 LibGit2.set_remote_url(cache_repo, repo_url, remote="upstream")
                 remote = LibGit2.get(LibGit2.GitRemote, repo, branch)
+                @test LibGit2.url(remote) == repo_url
+                @test LibGit2.push_url(remote) == repo_url
                 @test sprint(show, remote) == "GitRemote:\nRemote name: upstream url: $repo_url"
                 LibGit2.add_fetch!(repo, remote, "upstream")
                 @test LibGit2.fetch_refspecs(remote) == String["+refs/heads/*:refs/remotes/upstream/*"]
@@ -278,6 +283,7 @@ mktempdir() do dir
 
                 remote = LibGit2.GitRemoteAnon(repo, repo_url)
                 @test LibGit2.url(remote) == repo_url
+                @test LibGit2.push_url(remote) == ""
                 @test LibGit2.name(remote) == ""
                 @test isa(remote, LibGit2.GitRemote)
                 close(remote)