Merge remote-tracking branch 'origin/pr/1331'

Author: ethomson

CHANGES.md

@@ -19,6 +19,8 @@
  - Status now does not show untracked files by default.  To retrieve
    untracked files, included the `StatusOptions.IncludeUntracked` and/or
    the `StatusOptions.RecurseUntrackedDirs` options.
+ - Status now does not show the ignored files by default.  To retrieve
+   ignored files, include the `StatusOptions.IncludeIgnored` option.
 
 ### Fixes
 

LibGit2Sharp.Tests/CheckoutFixture.cs

@@ -625,7 +625,7 @@ public void CheckoutRetainsIgnoredChanges()
                     "bin/some_ignored_file.txt",
                     "hello from this ignored file.");
 
-                Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
+                Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));
 
@@ -652,7 +652,7 @@ public void ForceCheckoutRetainsIgnoredChanges()
                     "bin/some_ignored_file.txt",
                     "hello from this ignored file.");
 
-                Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
+                Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));
 

LibGit2Sharp.Tests/IgnoreFixture.cs

@@ -107,7 +107,7 @@ public void HonorDeeplyNestedGitIgnoreFile()
                 var file = string.Format("deeply{0}nested{0}file.txt", pd);
                 Touch(repo.Info.WorkingDirectory, file, "Yeah!");
 
-                var repositoryStatus = repo.RetrieveStatus();
+                var repositoryStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
                 Assert.True(repositoryStatus.IsDirty);
 
                 Assert.Equal(FileStatus.Ignored, repositoryStatus[ignoredFile].State);

LibGit2Sharp.Tests/StatusFixture.cs

@@ -310,7 +310,7 @@ public void RetrievingTheStatusOfAnEmptyRepositoryHonorsTheGitIgnoreDirectives()
 
                 Touch(repo.Info.WorkingDirectory, ".gitignore", "*.txt" + Environment.NewLine);
 
-                RepositoryStatus newStatus = repo.RetrieveStatus();
+                RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
                 Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
@@ -422,7 +422,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectives()
                  * #       new_untracked_file.txt
                  */
 
-                RepositoryStatus newStatus = repo.RetrieveStatus();
+                RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
                 Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
@@ -502,7 +502,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/what-about-me.txt"));
 
-                RepositoryStatus newStatus = repo.RetrieveStatus();
+                RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
                 Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
 
                 var sb = new StringBuilder();
@@ -513,7 +513,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
                 Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("bin/what-about-me.txt"));
 
-                newStatus = repo.RetrieveStatus();
+                newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = 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"));