Skip to content

Commit 8ca66fb

Browse files
TherzokTherzok
committed
Update libgit2 to 47f3740
libgit2/libgit2@9bbc8f3...47f3740
1 parent 2e3b534 commit 8ca66fb

15 files changed

+74
-17
lines changed

‎Lib/NativeBinaries/amd64/git2-47f3740.dll

1010 KB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb renamed to ‎Lib/NativeBinaries/amd64/git2-47f3740.pdb

5.54 MB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-9bbc8f3.dll

-1010 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-47f3740.dll

758 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-9bbc8f3.pdb renamed to ‎Lib/NativeBinaries/x86/git2-47f3740.pdb

5.54 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-9bbc8f3.dll

-757 KB
Binary file not shown.

‎LibGit2Sharp/Core/GitMergeOpts.cs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ internal struct GitMergeOpts
3131
/// Flags for automerging content.
3232
/// </summary>
3333
public MergeFileFavor MergeFileFavorFlags;
34+
35+
/// <summary>
36+
/// Flags to use for file merging.
37+
/// </summary>
38+
public GitMergeFileFlags FileFlags;
3439
}
3540

3641
/// <summary>
@@ -105,4 +110,53 @@ internal enum GitMergeTreeFlags
105110
/// </summary>
106111
GIT_MERGE_TREE_FIND_RENAMES = (1 << 0),
107112
}
113+
114+
[Flags]
115+
internal enum GitMergeFileFlags
116+
{
117+
/// <summary>
118+
/// No options.
119+
/// </summary>
120+
GIT_MERGE_FILE_DEFAULT = 0,
121+
122+
/// <summary>
123+
/// Creates standard conflicted merge files.
124+
/// </summary>
125+
GIT_MERGE_FILE_STYLE_MERGE = (1 << 0),
126+
127+
/// <summary>
128+
/// Creates diff3 style files.
129+
/// </summary>
130+
GIT_MERGE_FILE_STYLE_DIFF3 = (1 << 1),
131+
132+
/// <summary>
133+
/// Condenses non-alphanumeric regions for simplified diff files.
134+
/// </summary>
135+
GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 2),
136+
137+
/// <summary>
138+
/// Ignores all whitespace.
139+
/// </summary>
140+
GIT_MERGE_FILE_IGNORE_WHITESPACE = (1 << 3),
141+
142+
/// <summary>
143+
/// Ignores changes in amount of whitespace.
144+
/// </summary>
145+
GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 4),
146+
147+
/// <summary>
148+
/// Ignores whitespace at the end of the line.
149+
/// </summary>
150+
GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 5),
151+
152+
/// <summary>
153+
/// Uses the 'patience' diff algorithm.
154+
/// </summary>
155+
GIT_MERGE_FILE_DIFF_PATIENCE = (1 << 6),
156+
157+
/// <summary>
158+
/// Take extra time to find the minimal diff.
159+
/// </summary>
160+
GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7),
161+
}
108162
}

‎LibGit2Sharp/Core/GitSmartSubtransportRegistration.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ internal class GitSmartSubtransportRegistration
88
{
99
public IntPtr SubtransportCallback;
1010
public uint Rpc;
11+
public IntPtr Param;
1112

1213
public delegate int create_callback(
1314
out IntPtr subtransport,
14-
IntPtr transport);
15+
IntPtr transport,
16+
IntPtr param);
1517
}
1618
}

‎LibGit2Sharp/Core/NativeDllName.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
22
{
33
internal static class NativeDllName
44
{
5-
public const string Name = "git2-9bbc8f3";
5+
public const string Name = "git2-47f3740";
66
}
77
}

‎LibGit2Sharp/Core/NativeMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ internal static extern int git_note_remove(
726726

727727
[DllImport(libgit2)]
728728
internal static extern int git_note_default_ref(
729-
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))] out string notes_ref,
729+
GitBuf buf,
730730
RepositorySafeHandle repo);
731731

732732
internal delegate int git_note_foreach_cb(

‎LibGit2Sharp/Core/Proxy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,12 +1298,12 @@ public static ObjectId git_note_create(
12981298
public static string git_note_default_ref(RepositorySafeHandle repo)
12991299
{
13001300
using (ThreadAffinity())
1301+
using (var buf = new GitBuf())
13011302
{
1302-
string notes_ref;
1303-
int res = NativeMethods.git_note_default_ref(out notes_ref, repo);
1303+
int res = NativeMethods.git_note_default_ref(buf, repo);
13041304
Ensure.ZeroResult(res);
13051305

1306-
return notes_ref;
1306+
return LaxUtf8Marshaler.FromNative(buf.ptr);
13071307
}
13081308
}
13091309

‎LibGit2Sharp/SmartSubtransportRegistration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ private static class EntryPoints
8080

8181
private static int Subtransport(
8282
out IntPtr subtransport,
83-
IntPtr transport)
83+
IntPtr transport,
84+
IntPtr payload)
8485
{
8586
subtransport = IntPtr.Zero;
8687

‎LibGit2Sharp/libgit2_hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9bbc8f350b80a5a6e94651ec667cf9e5d545b317
1+
47f37400253210f483d84fb9c2ecf44fb5986849

‎libgit2

Submodule libgit2 updated 107 files

‎nuget.package/build/LibGit2Sharp.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
4-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-9bbc8f3.dll">
5-
<Link>NativeBinaries\amd64\git2-9bbc8f3.dll</Link>
4+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-47f3740.dll">
5+
<Link>NativeBinaries\amd64\git2-47f3740.dll</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
</None>
8-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-9bbc8f3.pdb">
9-
<Link>NativeBinaries\amd64\git2-9bbc8f3.pdb</Link>
8+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-47f3740.pdb">
9+
<Link>NativeBinaries\amd64\git2-47f3740.pdb</Link>
1010
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1111
</None>
12-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-9bbc8f3.dll">
13-
<Link>NativeBinaries\x86\git2-9bbc8f3.dll</Link>
12+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-47f3740.dll">
13+
<Link>NativeBinaries\x86\git2-47f3740.dll</Link>
1414
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1515
</None>
16-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-9bbc8f3.pdb">
17-
<Link>NativeBinaries\x86\git2-9bbc8f3.pdb</Link>
16+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-47f3740.pdb">
17+
<Link>NativeBinaries\x86\git2-47f3740.pdb</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
2020
</ItemGroup>

0 commit comments

Comments
 (0)