Skip to content

Commit 1a586e3

Browse files
committed
make excluding ignored files the default in status options perf improvement
1 parent 70ad4a5 commit 1a586e3

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

LibGit2Sharp.Tests/CheckoutFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ public void CheckoutRetainsIgnoredChanges()
625625
"bin/some_ignored_file.txt",
626626
"hello from this ignored file.");
627627

628-
Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
628+
Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
629629

630630
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));
631631

@@ -652,7 +652,7 @@ public void ForceCheckoutRetainsIgnoredChanges()
652652
"bin/some_ignored_file.txt",
653653
"hello from this ignored file.");
654654

655-
Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
655+
Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
656656

657657
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));
658658

LibGit2Sharp.Tests/IgnoreFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void HonorDeeplyNestedGitIgnoreFile()
107107
var file = string.Format("deeply{0}nested{0}file.txt", pd);
108108
Touch(repo.Info.WorkingDirectory, file, "Yeah!");
109109

110-
var repositoryStatus = repo.RetrieveStatus();
110+
var repositoryStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
111111
Assert.True(repositoryStatus.IsDirty);
112112

113113
Assert.Equal(FileStatus.Ignored, repositoryStatus[ignoredFile].State);

LibGit2Sharp.Tests/StatusFixture.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public void RetrievingTheStatusOfAnEmptyRepositoryHonorsTheGitIgnoreDirectives()
310310

311311
Touch(repo.Info.WorkingDirectory, ".gitignore", "*.txt" + Environment.NewLine);
312312

313-
RepositoryStatus newStatus = repo.RetrieveStatus();
313+
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
314314
Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());
315315

316316
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
@@ -422,7 +422,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectives()
422422
* # new_untracked_file.txt
423423
*/
424424

425-
RepositoryStatus newStatus = repo.RetrieveStatus();
425+
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
426426
Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());
427427

428428
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
@@ -498,7 +498,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
498498
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
499499
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/what-about-me.txt"));
500500

501-
RepositoryStatus newStatus = repo.RetrieveStatus();
501+
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
502502
Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
503503

504504
var sb = new StringBuilder();
@@ -509,7 +509,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
509509
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
510510
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("bin/what-about-me.txt"));
511511

512-
newStatus = repo.RetrieveStatus();
512+
newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
513513

514514
Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
515515
Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));

LibGit2Sharp/StatusOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public sealed class StatusOptions
3535
public StatusOptions()
3636
{
3737
DetectRenamesInIndex = true;
38-
IncludeIgnored = true;
3938
}
4039

4140
/// <summary>

0 commit comments

Comments
 (0)