Skip to content

Update libgit2 to ef5a385 #1728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2019
Merged

Update libgit2 to ef5a385 #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcd16d8
Update libgit2 to ef5a385
ethomson Oct 16, 2019
8b2ed49
GitRemoteCallbacks: add url_resolve callback
ethomson Oct 16, 2019
aad6094
Rebase: include new commit signing callback
ethomson Oct 16, 2019
64ab971
Clone: remove obsolete test for pathless URLs
ethomson Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions LibGit2Sharp.Tests/CloneFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions LibGit2Sharp/Core/GitRebaseOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 2 additions & 0 deletions LibGit2Sharp/Core/GitRemoteCallbacks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ internal struct GitRemoteCallbacks
internal IntPtr transport;

internal IntPtr payload;

internal NativeMethods.url_resolve_callback resolve_url;
}
}
14 changes: 14 additions & 0 deletions LibGit2Sharp/Core/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp/LibGit2Sharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down