Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2sharp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Ungureanu <marius.ungureanu@xamarin.com>2014-05-28 16:24:41 +0400
committerMarius Ungureanu <marius.ungureanu@xamarin.com>2014-05-30 18:39:18 +0400
commit40ac869fd4765107e147a25d15756def13bbad3c (patch)
treeb91460bd9872b3b02eecd246ce0888c3a30ebd36 /LibGit2Sharp.Tests
parent3c3035dadfae991825018db6cea34be32f8d64ec (diff)
Update libgit2 binaries to 58eea5e
https://github.com/libgit2/libgit2/compare/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.
Diffstat (limited to 'LibGit2Sharp.Tests')
-rw-r--r--LibGit2Sharp.Tests/StatusFixture.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
index b70ff0ae..4a63bc93 100644
--- a/LibGit2Sharp.Tests/StatusFixture.cs
+++ b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -495,8 +495,12 @@ namespace LibGit2Sharp.Tests
Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus("bin/look-ma.txt"));
Assert.Equal(FileStatus.Untracked, repo.Index.RetrieveStatus("bin/what-about-me.txt"));
+ // bin/* is considered as ignoring the dir itself
newStatus = repo.Index.RetrieveStatus();
+ Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
+ // if we recurse into ignored dirs, then we get the actual list
+ newStatus = repo.Index.RetrieveStatus(new StatusOptions { RecurseIgnoredDirs = true });
Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
}