make excluding ignored files the default in status options perf impro…

…vement
libgit2 · Jun 30, 2016 · 1a586e3 · 1a586e3
1 parent 70ad4a5
commit 1a586e3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/LibGit2Sharp.Tests/CheckoutFixture.cs b/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));
 

diff --git a/LibGit2Sharp.Tests/IgnoreFixture.cs b/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);

diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/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));
@@ -498,7 +498,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();
@@ -509,7 +509,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"));

diff --git a/LibGit2Sharp/StatusOptions.cs b/LibGit2Sharp/StatusOptions.cs
@@ -35,7 +35,6 @@ public sealed class StatusOptions
         public StatusOptions()
         {
             DetectRenamesInIndex = true;
-            IncludeIgnored = true;
         }
 
         /// <summary>