Fix Remotes.Add(name, url, refspec) implementation

Prevents the creation of a default fetch refspec beside the passed in one.

Author: nulltoken

LibGit2Sharp.Tests/RemoteFixture.cs

@@ -170,5 +170,27 @@ public void DoesNotThrowWhenARemoteHasNoUrlSet()
                 Assert.Equal(1, remotes.Count(r => r.Name == "no_url"));
             }
         }
+
+        [Fact]
+        public void CreatingARemoteAddsADefaultFetchRefSpec()
+        {
+            var path = CloneStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var remote = repo.Network.Remotes.Add("one", "http://github.com/up/stream");
+                Assert.Equal("+refs/heads/*:refs/remotes/one/*", remote.RefSpecs.Single().Specification);
+            }
+        }
+
+        [Fact]
+        public void CanCreateARemoteWithASpecifiedFetchRefSpec()
+        {
+            var path = CloneStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var remote = repo.Network.Remotes.Add("two", "http://github.com/up/stream", "+refs/heads/*:refs/remotes/grmpf/*");
+                Assert.Equal("+refs/heads/*:refs/remotes/grmpf/*", remote.RefSpecs.Single().Specification);
+            }
+        }
     }
 }

LibGit2Sharp/Core/NativeMethods.cs

@@ -953,6 +953,15 @@ internal static extern int git_remote_create_inmemory(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string refspec,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url);
 
+
+        [DllImport(libgit2)]
+        internal static extern int git_remote_create_with_fetchspec(
+            out RemoteSafeHandle remote,
+            RepositorySafeHandle repo,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string refspec);
+
         [DllImport(libgit2)]
         internal static extern void git_remote_disconnect(RemoteSafeHandle remote);
 
@@ -1009,11 +1018,6 @@ internal static extern int git_remote_set_callbacks(
             RemoteSafeHandle remote,
             ref GitRemoteCallbacks callbacks);
 
-        [DllImport(libgit2)]
-        internal static extern int git_remote_add_fetch(
-            RemoteSafeHandle remote,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof (StrictUtf8Marshaler))] string refspec);
-
         internal delegate int remote_progress_callback(IntPtr str, int len, IntPtr data);
 
         internal delegate int remote_completion_callback(RemoteCompletionType type, IntPtr data);

LibGit2Sharp/Core/Proxy.cs

@@ -1679,6 +1679,18 @@ public static RemoteSafeHandle git_remote_create(RepositorySafeHandle repo, stri
             }
         }
 
+        public static RemoteSafeHandle git_remote_create_with_fetchspec(RepositorySafeHandle repo, string name, string url, string refspec)
+        {
+            using (ThreadAffinity())
+            {
+                RemoteSafeHandle handle;
+                int res = NativeMethods.git_remote_create_with_fetchspec(out handle, repo, name, url, refspec);
+                Ensure.ZeroResult(res);
+
+                return handle;
+            }
+        }
+
         public static RemoteSafeHandle git_remote_create_inmemory(RepositorySafeHandle repo, string url, string refspec)
         {
             using (ThreadAffinity())
@@ -1862,15 +1874,6 @@ public static void git_remote_set_autotag(RemoteSafeHandle remote, TagFetchMode
             NativeMethods.git_remote_set_autotag(remote, value);
         }
 
-        public static void git_remote_add_fetch(RemoteSafeHandle remote, string refspec)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_remote_add_fetch(remote, refspec);
-                Ensure.ZeroResult(res);
-            }
-        }
-
         public static void git_remote_set_callbacks(RemoteSafeHandle remote, ref GitRemoteCallbacks callbacks)
         {
             using (ThreadAffinity())

LibGit2Sharp/RemoteCollection.cs

@@ -120,10 +120,8 @@ public virtual Remote Add(string name, string url, string fetchRefSpec)
             Ensure.ArgumentNotNull(url, "url");
             Ensure.ArgumentNotNull(fetchRefSpec, "fetchRefSpec");
 
-            using (RemoteSafeHandle handle = Proxy.git_remote_create(repository.Handle, name, url))
+            using (RemoteSafeHandle handle = Proxy.git_remote_create_with_fetchspec(repository.Handle, name, url, fetchRefSpec))
             {
-                Proxy.git_remote_add_fetch(handle, fetchRefSpec);
-                Proxy.git_remote_save(handle);
                 return Remote.BuildFromPtr(handle, this.repository);
             }
         }