8000 Update libgit2 binaries to 58eea5e · apfunk/libgit2sharp@40ac869 · GitHub
[go: up one dir, main page]

Skip to content

Commit 40ac869

Browse files
committed
Update libgit2 binaries to 58eea5e
libgit2/libgit2@06d772d...58eea5e Configuration: Use snapshot for Get/Find calls. Thanks @carlosmn. Merge: Keep track of new MergePreference. StatusFixture: change expectations for star-ignore When passing bin/* newer libgit2 considers that as ignoreing the bin/ directory and thus won't give us its contents unless we pass in the RecurseIgnoredDirs option. Done by @carlosmn.
1 parent 3c3035d commit 40ac869

24 files changed

+110
-23
lines changed
-887 KB
Binary file not shown.
-4.6 MB
Binary file not shown.
920 KB
Binary file not shown.
5.23 MB
Binary file not shown.
-684 KB
Binary file not shown.
-4.57 MB
Binary file not shown.
702 KB
Binary file not shown.
5.23 MB
Binary file not shown.

LibGit2Sharp.Tests/StatusFixture.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,12 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
495495
Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus("bin/look-ma.txt"));
496496
Assert.Equal(FileStatus.Untracked, repo.Index.RetrieveStatus("bin/what-about-me.txt"));
497497

498+
// bin/* is considered as ignoring the dir itself
498499
newStatus = repo.Index.RetrieveStatus();
500+
Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
499501

502+
// if we recurse into ignored dirs, then we get the actual list
503+
newStatus = repo.Index.RetrieveStatus(new StatusOptions { RecurseIgnoredDirs = true });
500504
Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
501505
Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
502506
}

LibGit2Sharp/BranchCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +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_iterator(repo, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE)
94+
return Proxy.git_branch_iterator(repo, GitBranchType.GIT_BRANCH_ALL)
9595
.ToList().GetEnumerator();
9696
}
9797

0 commit comments

Comments
 (0)
0