Make GitCloneOptions a struct to fix issue libgit2#635

phkelley · phkelley · commit b9d7e791c0fb · 2014-03-25T19:26:08.000-04:00
diff --git a/LibGit2Sharp/Core/GitCloneOptions.cs b/LibGit2Sharp/Core/GitCloneOptions.cs
@@ -4,9 +4,9 @@
 namespace LibGit2Sharp.Core
 {
     [StructLayout(LayoutKind.Sequential)]
-    internal class GitCloneOptions
+    internal struct GitCloneOptions
     {
-        public uint Version = 1;
+        public uint Version;
 
         public GitCheckoutOpts CheckoutOpts;
         public GitRemoteCallbacks RemoteCallbacks;
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -238,7 +238,7 @@ internal static extern int git_clone(
             out RepositorySafeHandle repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string origin_url,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath workdir_path,
-            GitCloneOptions opts);
+            ref GitCloneOptions opts);
 
         [DllImport(libgit2)]
         internal static extern IntPtr git_commit_author(GitObjectSafeHandle commit);
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -278,12 +278,12 @@ public static void git_checkout_index(RepositorySafeHandle repo, GitObjectSafeHa
         public static RepositorySafeHandle git_clone(
             string url,
             string workdir,
-            GitCloneOptions opts)
+            ref GitCloneOptions opts)
         {
             using (ThreadAffinity())
             {
                 RepositorySafeHandle repo;
-                int res = NativeMethods.git_clone(out repo, url, workdir, opts);
+                int res = NativeMethods.git_clone(out repo, url, workdir, ref opts);
                 Ensure.ZeroResult(res);
                 return repo;
             }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -558,6 +558,7 @@ public static string Clone(string sourceUrl, string workdirPath,
 
             var cloneOpts = new GitCloneOptions
             {
+                Version = 1,
                 Bare = options.IsBare ? 1 : 0,
                 CheckoutOpts =
                 {
@@ -572,7 +573,7 @@ public static string Clone(string sourceUrl, string workdirPath,
             };
 
             FilePath repoPath;
-            using (RepositorySafeHandle repo = Proxy.git_clone(sourceUrl, workdirPath, cloneOpts))
+            using (RepositorySafeHandle repo = Proxy.git_clone(sourceUrl, workdirPath, ref cloneOpts))
             {
                 repoPath = Proxy.git_repository_path(repo);
             }

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`namespace LibGit2Sharp.Core`
`5`	`5`	`{`
`6`	`6`	`[StructLayout(LayoutKind.Sequential)]`
`7`		`- internal class GitCloneOptions`
	`7`	`+ internal struct GitCloneOptions`
`8`	`8`	`{`
`9`		`- public uint Version = 1;`
	`9`	`+ public uint Version;`
`10`	`10`
`11`	`11`	`public GitCheckoutOpts CheckoutOpts;`
`12`	`12`	`public GitRemoteCallbacks RemoteCallbacks;`
Original file line number	Diff line number	Diff line change
`@@ -278,12 +278,12 @@ public static void git_checkout_index(RepositorySafeHandle repo, GitObjectSafeHa`
`278`	`278`	`public static RepositorySafeHandle git_clone(`
`279`	`279`	`string url,`
`280`	`280`	`string workdir,`
`281`		`- GitCloneOptions opts)`
	`281`	`+ ref GitCloneOptions opts)`
`282`	`282`	`{`
`283`	`283`	`using (ThreadAffinity())`
`284`	`284`	`{`
`285`	`285`	`RepositorySafeHandle repo;`
`286`		`- int res = NativeMethods.git_clone(out repo, url, workdir, opts);`
	`286`	`+ int res = NativeMethods.git_clone(out repo, url, workdir, ref opts);`
`287`	`287`	`Ensure.ZeroResult(res);`
`288`	`288`	`return repo;`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,7 @@ public static string Clone(string sourceUrl, string workdirPath,`
`558`	`558`
`559`	`559`	`var cloneOpts = new GitCloneOptions`
`560`	`560`	`{`
	`561`	`+ Version = 1,`
`561`	`562`	`Bare = options.IsBare ? 1 : 0,`
`562`	`563`	`CheckoutOpts =`
`563`	`564`	`{`
`@@ -572,7 +573,7 @@ public static string Clone(string sourceUrl, string workdirPath,`
`572`	`573`	`};`
`573`	`574`
`574`	`575`	`FilePath repoPath;`
`575`		`- using (RepositorySafeHandle repo = Proxy.git_clone(sourceUrl, workdirPath, cloneOpts))`
	`576`	`+ using (RepositorySafeHandle repo = Proxy.git_clone(sourceUrl, workdirPath, ref cloneOpts))`
`576`	`577`	`{`
`577`	`578`	`repoPath = Proxy.git_repository_path(repo);`
`578`	`579`	`}`