Skip to content

Update libgit2 binaries to e87d9d3 #549

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
nulltoken merged 1 commit into from
Nov 6, 2013
Merged

Update libgit2 binaries to e87d9d3 #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed Lib/NativeBinaries/amd64/git2-711333e.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Lib/NativeBinaries/amd64/git2-711333e.pdb
View file
Open in desktop
Binary file not shown.
Binary file added Lib/NativeBinaries/amd64/git2-e87d9d3.dll
View file
Open in desktop
Binary file not shown.
Binary file added Lib/NativeBinaries/amd64/git2-e87d9d3.pdb
View file
Open in desktop
Binary file not shown.
Binary file removed Lib/NativeBinaries/x86/git2-711333e.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Lib/NativeBinaries/x86/git2-711333e.pdb
View file
Open in desktop
Binary file not shown.
Binary file added Lib/NativeBinaries/x86/git2-e87d9d3.dll
View file
Open in desktop
Binary file not shown.
Binary file added Lib/NativeBinaries/x86/git2-e87d9d3.pdb
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/ReflogFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void CanReadReflog()
}

[Fact]
public void CannotReadReflogOnUnknownReference()
public void ReadingReflogOfInvalidReferenceNameThrows()
{
using (var repo = new Repository(StandardTestRepoWorkingDirPath))
{
Expand Down
18 changes: 1 addition & 17 deletions LibGit2Sharp/BranchCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ private Branch BuildFromReferenceName(string canonicalName)
/// <returns>An <see cref="IEnumerator{T}"/> object that can be used to iterate through the collection.</returns>
public virtual IEnumerator<Branch> GetEnumerator()
{
return Proxy.git_branch_foreach(repo.Handle, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE, BranchToCanonicalName)
.Select(n => this[n])
return Proxy.git_branch_iterator(repo, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE)
.GetEnumerator();
}

Expand Down Expand Up @@ -203,21 +202,6 @@ private static bool LooksLikeABranchName(string referenceName)
referenceName.LooksLikeRemoteTrackingBranch();
}

private static string BranchToCanonicalName(IntPtr namePtr, GitBranchType branchType)
{
string shortName = LaxUtf8Marshaler.FromNative(namePtr);

switch (branchType)
{
case GitBranchType.GIT_BRANCH_LOCAL:
return ShortToLocalName(shortName);
case GitBranchType.GIT_BRANCH_REMOTE:
return ShortToRemoteName(shortName);
default:
return shortName;
}
}

private string DebuggerDisplay
{
get
Expand Down
16 changes: 8 additions & 8 deletions LibGit2Sharp/ContentChanges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,34 +80,34 @@ private int FileCallback(GitDiffDelta delta, float progress, IntPtr payload)
return 0;
}

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

AppendToPatch(decodedContent);
return 0;
}

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

string prefix;

switch (lineorigin)
switch (line.lineOrigin)
{
case GitDiffLineOrigin.GIT_DIFF_LINE_ADDITION:
LinesAdded++;
prefix = Encoding.ASCII.GetString(new[] { (byte)lineorigin });
prefix = Encoding.ASCII.GetString(new[] { (byte)line.lineOrigin });
break;

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

case GitDiffLineOrigin.GIT_DIFF_LINE_CONTEXT:
prefix = Encoding.ASCII.GetString(new[] { (byte)lineorigin });
prefix = Encoding.ASCII.GetString(new[] { (byte)line.lineOrigin });
break;

default:
Expand Down
8 changes: 8 additions & 0 deletions LibGit2Sharp/Core/EncodingMarshaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text;

Expand Down Expand Up @@ -143,6 +144,13 @@ public static string FromBuffer(Encoding encoding, byte[] buffer)
length++;
}

return FromBuffer(encoding, buffer, length);
}

public static string FromBuffer(Encoding encoding, byte[] buffer, int length)
{
Debug.Assert(buffer != null);

if (length == 0)
{
return String.Empty;
Expand Down
3 changes: 3 additions & 0 deletions LibGit2Sharp/Core/GitCheckoutOpts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ internal struct GitCheckoutOpts :IDisposable
public IntPtr baseline;
public IntPtr target_directory;

public IntPtr our_label;
public IntPtr their_label;

public void Dispose()
{
if (paths == null)
Expand Down
Loading