diff --git a/Lib/NativeBinaries/amd64/git2.dll b/Lib/NativeBinaries/amd64/git2.dll index bdc1cc9f9..eb3c3a807 100644 Binary files a/Lib/NativeBinaries/amd64/git2.dll and b/Lib/NativeBinaries/amd64/git2.dll differ diff --git a/Lib/NativeBinaries/amd64/git2.pdb b/Lib/NativeBinaries/amd64/git2.pdb index eb75a4d97..95249e095 100644 Binary files a/Lib/NativeBinaries/amd64/git2.pdb and b/Lib/NativeBinaries/amd64/git2.pdb differ diff --git a/Lib/NativeBinaries/x86/git2.dll b/Lib/NativeBinaries/x86/git2.dll index 2b0d92ce6..cf70316a0 100644 Binary files a/Lib/NativeBinaries/x86/git2.dll and b/Lib/NativeBinaries/x86/git2.dll differ diff --git a/Lib/NativeBinaries/x86/git2.pdb b/Lib/NativeBinaries/x86/git2.pdb index cd1b66778..bb7a02379 100644 Binary files a/Lib/NativeBinaries/x86/git2.pdb and b/Lib/NativeBinaries/x86/git2.pdb differ diff --git a/LibGit2Sharp.Tests/FetchHeadFixture.cs b/LibGit2Sharp.Tests/FetchHeadFixture.cs index 059a0e75b..c6cc8656b 100644 --- a/LibGit2Sharp.Tests/FetchHeadFixture.cs +++ b/LibGit2Sharp.Tests/FetchHeadFixture.cs @@ -97,6 +97,14 @@ public void CanIterateFetchHead(string url) TargetSha = "8f50ba15d49353813cc6e20298002c0d17b0a9ee", ForMerge = false, }, + new FetchHeadExpected + { + Name = "FETCH_HEAD[6]", + RemoteName = "refs/tags/nearly-dangling", + Url = "git://github.com/libgit2/TestGitRepository.git", + TargetSha = "6e0c7bdb9b4ed93212491ee778ca1c65047cab4e", + ForMerge = false, + }, }; VerifyFetchHead(repo.Network.FetchHeads.ToArray(), expected); diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs index f4496eb57..d5c60ecf9 100644 --- a/LibGit2Sharp/Core/GitDiff.cs +++ b/LibGit2Sharp/Core/GitDiff.cs @@ -174,6 +174,9 @@ internal class GitDiffOptions : IDisposable public GitStrArrayIn PathSpec; public Int64 MaxSize; + public IntPtr NotifyCallback; + public IntPtr NotifyPayload; + public void Dispose() { if (PathSpec == null) diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt index 3c2ed97ab..b3272a022 100644 --- a/LibGit2Sharp/libgit2_hash.txt +++ b/LibGit2Sharp/libgit2_hash.txt @@ -1 +1 @@ -5f9f69d983d7ebc2d9d29cf295e86f32ab12906d +e026cfee003e103d79e56983d68a206ae907eada diff --git a/libgit2 b/libgit2 index 5f9f69d98..e026cfee0 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit 5f9f69d983d7ebc2d9d29cf295e86f32ab12906d +Subproject commit e026cfee003e103d79e56983d68a206ae907eada