8000 Merge remote-tracking branch 'origin/pr/1331' · OctopusDeploy/libgit2sharp@363cb3f · GitHub
[go: up one dir, main page]
Skip to content

Commit 363cb3f

Browse files
ethomsonethomson
committed
Merge remote-tracking branch 'origin/pr/1331'
2 parents 8deaf1e + 1a586e3 commit 363cb3f

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

‎CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
- Status now does not show untracked files by default. To retrieve
2020
untracked files, included the `StatusOptions.IncludeUntracked` and/or
2121
the `StatusOptions.RecurseUntrackedDirs` options.
22+
- Status now does not show the ignored files by default. To retrieve
23+
ignored files, include the `StatusOptions.IncludeIgnored` option.
2224

2325
### Fixes
2426

‎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));
@@ -502,7 +502,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
502502
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
503503
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/what-about-me.txt"));
504504

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

508508
var sb = new StringBuilder();
@@ -513,7 +513,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
513513
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
514514
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("bin/what-about-me.txt"));
515515

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

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

0 commit comments

Comments
 (0)
0