diff --git a/LibGit2Sharp.Tests/CloneFixture.cs b/LibGit2Sharp.Tests/CloneFixture.cs index 976ef932..09af475f 100644 --- 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(() => 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 index 3ae4e0ed..e1416e80 100644 --- 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 index 4c797b59..54cdb46e 100644 --- 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 index 9c419036..7dd99ac3 100644 --- a/LibGit2Sharp/Core/NativeMethods.cs +++ b/LibGit2Sharp/Core/NativeMethods.cs @@ -206,6 +206,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, @@ -1915,6 +1922,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 index c5000ebf..b803b382 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -35,7 +35,7 @@ - + diff --git a/version.json b/version.json index 63268d41..36406d69 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.110.1", + "version": "1.110.2", "cloudBuild": { "buildNumber": { "enabled": true