From 21d4f13ac7c739a5526cf088fbd8765d4ad12f57 Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sun, 5 Sep 2021 08:14:25 +0200 Subject: [PATCH 1/4] Update to libgit2 v1.2.0 --- LibGit2Sharp/LibGit2Sharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 0c326b095..d35369d94 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -32,7 +32,7 @@ - + From 297167eb2755c883bb14cf21ccffeffb5a8aa60e Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sun, 5 Sep 2021 09:01:29 +0200 Subject: [PATCH 2/4] Fix rebase options --- LibGit2Sharp/Core/GitRebaseOptions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LibGit2Sharp/Core/GitRebaseOptions.cs b/LibGit2Sharp/Core/GitRebaseOptions.cs index e1416e803..981bfe919 100644 --- a/LibGit2Sharp/Core/GitRebaseOptions.cs +++ b/LibGit2Sharp/Core/GitRebaseOptions.cs @@ -18,6 +18,8 @@ internal class GitRebaseOptions public GitCheckoutOpts checkout_options = new GitCheckoutOpts { version = 1 }; + private IntPtr padding; // TODO: add git_commit_create_cb + public NativeMethods.commit_signing_callback signing_callback; } } From eb3dd1c72a0202bb0ddc669364b3c4e57e07412d Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sun, 5 Sep 2021 09:37:19 +0200 Subject: [PATCH 3/4] Fix git remote callbacks --- LibGit2Sharp/Core/GitRemoteCallbacks.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LibGit2Sharp/Core/GitRemoteCallbacks.cs b/LibGit2Sharp/Core/GitRemoteCallbacks.cs index 54cdb46ed..4900ad562 100644 --- a/LibGit2Sharp/Core/GitRemoteCallbacks.cs +++ b/LibGit2Sharp/Core/GitRemoteCallbacks.cs @@ -33,6 +33,8 @@ internal struct GitRemoteCallbacks internal IntPtr transport; + private IntPtr padding; // TODO: add git_remote_ready_cb + internal IntPtr payload; internal NativeMethods.url_resolve_callback resolve_url; From 491d248472fd00f4fc5bef8da61cda14ba3b6735 Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sun, 5 Sep 2021 10:11:14 +0200 Subject: [PATCH 4/4] Fix memory corruption with odb backend --- LibGit2Sharp/Core/GitOdbBackend.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LibGit2Sharp/Core/GitOdbBackend.cs b/LibGit2Sharp/Core/GitOdbBackend.cs index 0d68a3433..3ff031048 100644 --- a/LibGit2Sharp/Core/GitOdbBackend.cs +++ b/LibGit2Sharp/Core/GitOdbBackend.cs @@ -33,6 +33,9 @@ static GitOdbBackend() public exists_prefix_callback ExistsPrefix; public IntPtr Refresh; public foreach_callback Foreach; + + private IntPtr Padding; // TODO: add writemidx + public IntPtr Writepack; public IntPtr Freshen; public free_callback Free;