Merge pull request libgit2#1728 from libgit2/ethomson/update_libgit2

ethomson · web-flow · commit e237c8b20cc6 · 2019-10-16T19:19:06.000+01:00
Update libgit2 to ef5a385
diff --git a/LibGit2Sharp.Tests/CloneFixture.cs b/LibGit2Sharp.Tests/CloneFixture.cs
@@ -297,14 +297,6 @@ public void CanInspectCertificateOnClone(string url, string hostname, Type certT
             Assert.True(checksHappy);
         }
 
-        [Fact]
-        public void CloningAnUrlWithoutPathThrows()
-        {
-            var scd = BuildSelfCleaningDirectory();
-
-            Assert.Throws<InvalidSpecificationException>(() => Repository.Clone("http://github.com", scd.DirectoryPath));
-        }
-
         [Theory]
         [InlineData("git://github.com/libgit2/TestGitRepository")]
         public void CloningWithoutWorkdirPathThrows(string url)
diff --git a/LibGit2Sharp/Core/GitRebaseOptions.cs b/LibGit2Sharp/Core/GitRebaseOptions.cs
@@ -17,5 +17,7 @@ internal class GitRebaseOptions
         public GitMergeOpts merge_options = new GitMergeOpts { Version = 1 };
 
         public GitCheckoutOpts checkout_options = new GitCheckoutOpts { version = 1 };
+
+        public NativeMethods.commit_signing_callback signing_callback;
     }
 }
diff --git a/LibGit2Sharp/Core/GitRemoteCallbacks.cs b/LibGit2Sharp/Core/GitRemoteCallbacks.cs
@@ -34,5 +34,7 @@ internal struct GitRemoteCallbacks
         internal IntPtr transport;
 
         internal IntPtr payload;
+
+        internal NativeMethods.url_resolve_callback resolve_url;
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -321,6 +321,13 @@ internal static extern unsafe int git_branch_remote_name(
             git_repository* repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string canonical_branch_name);
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate int commit_signing_callback(
+            IntPtr signature,
+            IntPtr signature_field,
+            IntPtr commit_content,
+            IntPtr payload);
+
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_rebase_init(
             out git_rebase* rebase,
@@ -2037,6 +2044,13 @@ internal static extern unsafe int git_cherrypick_commit(out git_index* index,
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void git_transaction_free(IntPtr txn);
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate int url_resolve_callback(
+            IntPtr url_resolved,
+            IntPtr url,
+            int direction,
+            IntPtr payload);
+
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe void git_worktree_free(git_worktree* worktree);
 
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.289]" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.298]" PrivateAssets="none" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="all" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.138" PrivateAssets="all" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ internal class GitRebaseOptions`
`17`	`17`	`public GitMergeOpts merge_options = new GitMergeOpts { Version = 1 };`
`18`	`18`
`19`	`19`	`public GitCheckoutOpts checkout_options = new GitCheckoutOpts { version = 1 };`
	`20`	`+`
	`21`	`+ public NativeMethods.commit_signing_callback signing_callback;`
`20`	`22`	`}`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,7 @@ internal struct GitRemoteCallbacks`
`34`	`34`	`internal IntPtr transport;`
`35`	`35`
`36`	`36`	`internal IntPtr payload;`
	`37`	`+`
	`38`	`+ internal NativeMethods.url_resolve_callback resolve_url;`
`37`	`39`	`}`
`38`	`40`	`}`