8000 Update libgit2 binaries to e87d9d3 · gitextensions/libgit2sharp@d9ecbae · GitHub
[go: up one dir, main page]
Skip to content

Commit d9ecbae

Browse files
nulltokennulltoken
committed
Update libgit2 binaries to e87d9d3
libgit2/libgit2@711333e...e87d9d3
1 parent 7b38c3c commit d9ecbae

31 files changed

+342
-193
lines changed

‎Lib/NativeBinaries/amd64/git2-711333e.dll

-798 KB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-711333e.pdb

-4.77 MB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-e87d9d3.dll

850 KB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-e87d9d3.pdb

4.48 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-711333e.dll

-602 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-711333e.pdb

-4.72 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-e87d9d3.dll

647 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-e87d9d3.pdb

4.45 MB
Binary file not shown.

‎LibGit2Sharp.Tests/ReflogFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void CanReadReflog()
3232
}
3333

3434
[Fact]
35-
public void CannotReadReflogOnUnknownReference()
35+
public void ReadingReflogOfInvalidReferenceNameThrows()
3636
{
3737
using (var repo = new Repository(StandardTestRepoWorkingDirPath))
3838
{

‎LibGit2Sharp/BranchCollection.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ private Branch BuildFromReferenceName(string canonicalName)
9191
/// <returns>An <see cref="IEnumerator{T}"/> object that can be used to iterate through the collection.</returns>
9292
public virtual IEnumerator<Branch> GetEnumerator()
9393
{
94-
return Proxy.git_branch_foreach(repo.Handle, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE, BranchToCanonicalName)
95-
.Select(n => this[n])
94+
return Proxy.git_branch_iterator(repo, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE)
9695
.GetEnumerator();
9796
}
9897

@@ -203,21 +202,6 @@ private static bool LooksLikeABranchName(string referenceName)
203202
referenceName.LooksLikeRemoteTrackingBranch();
204203
}
205204

206-
private static string BranchToCanonicalName(IntPtr namePtr, GitBranchType branchType)
207-
{
208-
string shortName = LaxUtf8Marshaler.FromNative(namePtr);
209-
210-
switch (branchType)
211-
{
212-
case GitBranchType.GIT_BRANCH_LOCAL:
213-
return ShortToLocalName(shortName);
214-
case GitBranchType.GIT_BRANCH_REMOTE:
215-
return ShortToRemoteName(shortName);
216-
default:
217-
return shortName;
218-
}
219-
}
220-
221205
private string DebuggerDisplay
222206
{
223207
get

‎LibGit2Sharp/ContentChanges.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,34 +80,34 @@ private int FileCallback(GitDiffDelta delta, float progress, IntPtr payload)
8080
return 0;
8181
}
8282

83-
private int HunkCallback(GitDiffDelta delta, GitDiffRange range, IntPtr header, UIntPtr headerlen, IntPtr payload)
83+
private int HunkCallback(GitDiffDelta delta, GitDiffHunk hunk, IntPtr payload)
8484
{
85-
string decodedContent = LaxUtf8Marshaler.FromNative(header, (int)headerlen);
85+
string decodedContent = LaxUtf8Marshaler.FromBuffer(hunk.Header, (int)hunk.HeaderLen);
8686

8787
AppendToPatch(decodedContent);
8888
return 0;
8989
}
9090

91-
private int LineCallback(GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, UIntPtr contentlen, IntPtr payload)
91+
private int LineCallback(GitDiffDelta delta, GitDiffHunk hunk, GitDiffLine line, IntPtr payload)
9292
{
93-
string decodedContent = LaxUtf8Marshaler.FromNative(content, (int)contentlen);
93+
string decodedContent = LaxUtf8Marshaler.FromNative(line.content, (int)line.contentLen);
9494

9595
string prefix;
9696

97-
switch (lineorigin)
97+
switch (line.lineOrigin)
9898
{
9999
case GitDiffLineOrigin.GIT_DIFF_LINE_ADDITION:
100100
LinesAdded++;
101-
prefix = Encoding.ASCII.GetString(new[] { (byte)lineorigin });
101+
prefix = Encoding.ASCII.GetString(new[] { (byte)line.lineOrigin });
102102
break;
103103

104104
case GitDiffLineOrigin.GIT_DIFF_LINE_DELETION:
105105
LinesDeleted++;
106-
prefix = Encoding.ASCII.GetString(new[] { (byte)lineorigin });
106+
prefix = Encoding.ASCII.GetString(new[] { (byte)line.lineOrigin });
107107
break;
108108

109109
case GitDiffLineOrigin.GIT_DIFF_LINE_CONTEXT:
110-
prefix = Encoding.ASCII.GetString(new[] { (byte)lineorigin });
110+
prefix = Encoding.ASCII.GetString(new[] { (byte)line.lineOrigin });
111111
break;
112112

113113
default:

‎LibGit2Sharp/Core/EncodingMarshaler.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Diagnostics;
23
using System.Runtime.InteropServices;
34
using System.Text;
45

@@ -143,6 +144,13 @@ public static string FromBuffer(Encoding encoding, byte[] buffer)
143144
length++;
144145
}
145146

147+
return FromBuffer(encoding, buffer, length);
148+
}
149+
150+
public static string FromBuffer(Encoding encoding, byte[] buffer, int length)
151+
{
152+
Debug.Assert(buffer != null);
153+
146154
if (length == 0)
147155
{
148156
return String.Empty;

‎LibGit2Sharp/Core/GitCheckoutOpts.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ internal struct GitCheckoutOpts :IDisposable
118118
public IntPtr baseline;
119119
public IntPtr target_directory;
120120

121+
public IntPtr our_label;
122+
public IntPtr their_label;
123+
121124
public void Dispose()
122125
{
123126
if (paths == null)

0 commit comments

Comments
 (0)
0