Skip to content

Fix struct align #5

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
2 commits merged into from
Dec 16, 2020
Merged

Fix struct align #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ed9fcf
Cherry-pick Merge pull request #1728 from libgit2/ethomson/update_lib…
ethomson Oct 16, 2019
f4bdd03
Increase version number
Dec 15, 2020
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 @@ -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,
Expand Down Expand Up @@ -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);

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 @@ -35,7 +35,7 @@
<ItemGroup>
<PackageReference Include="Mendix.LibGit2Sharp.NativeBinaries" Version="[1.110.1]" PrivateAssets="none" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.138" PrivateAssets="all" />
</ItemGroup>

<Import Project="..\Targets\CodeGenerator.targets" />
Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down