Merge pull request libgit2#1328 from paulgmiller/ignoredopt

Edward Thomson · web-flow · commit c27925b21ab3 · 2016-06-28T09:40:17.000-04:00
Include Ignored Options
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -318,6 +318,29 @@ public void RetrievingTheStatusOfAnEmptyRepositoryHonorsTheGitIgnoreDirectives()
             }
         }
 
+        [Fact]
+        public void RetrievingTheStatusWithoutIncludeIgnoredIgnoresButDoesntInclude()
+        {
+            string repoPath = InitNewRepository();
+
+            using (var repo = new Repository(repoPath))
+            {
+                const string relativePath = "look-ma.txt";
+                Touch(repo.Info.WorkingDirectory, relativePath, "I'm going to be ignored!");
+                var opt = new StatusOptions { IncludeIgnored = false };
+                Assert.False(opt.IncludeIgnored);
+                RepositoryStatus status = repo.RetrieveStatus(opt);
+                Assert.Equal(new[] { relativePath }, status.Untracked.Select(s => s.FilePath));
+
+                Touch(repo.Info.WorkingDirectory, ".gitignore", "*.txt" + Environment.NewLine);
+
+                RepositoryStatus newStatus = repo.RetrieveStatus(opt);
+                Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());
+
+                Assert.False(newStatus.Ignored.Any());
+            }
+        }
+
         [Fact]
         public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectives()
         {
diff --git a/LibGit2Sharp/RepositoryStatus.cs b/LibGit2Sharp/RepositoryStatus.cs
@@ -79,11 +79,15 @@ private static GitStatusOptions CreateStatusOptions(StatusOptions options)
                 Version = 1,
                 Show = (GitStatusShow)options.Show,
                 Flags =
-                    GitStatusOptionFlags.IncludeIgnored |
                     GitStatusOptionFlags.IncludeUntracked |
                     GitStatusOptionFlags.RecurseUntrackedDirs,
             };
 
+            if (options.IncludeIgnored)
+            {
+                coreOptions.Flags |= GitStatusOptionFlags.IncludeIgnored;
+            }
+
             if (options.DetectRenamesInIndex)
             {
                 coreOptions.Flags |=
diff --git a/LibGit2Sharp/StatusOptions.cs b/LibGit2Sharp/StatusOptions.cs
@@ -35,6 +35,7 @@ public sealed class StatusOptions
         public StatusOptions()
         {
             DetectRenamesInIndex = true;
+            IncludeIgnored = true;
         }
 
         /// <summary>
@@ -84,5 +85,14 @@ public StatusOptions()
         /// Unaltered meaning the file is identical in the working directory, the index and HEAD.
         /// </remarks>
         public bool IncludeUnaltered { get; set; }
+
+        /// <summary>
+        /// Include ignored files when scanning for status
+        /// </summary>
+        /// <remarks>
+        /// ignored meaning present in .gitignore. Defaults to true for back compat but may improve perf to not include if you have thousands of ignored files.
+        /// </remarks>
+        public bool IncludeIgnored { get; set; }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public sealed class StatusOptions`
`35`	`35`	`public StatusOptions()`
`36`	`36`	`{`
`37`	`37`	`DetectRenamesInIndex = true;`
	`38`	`+ IncludeIgnored = true;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`/// <summary>`
`@@ -84,5 +85,14 @@ public StatusOptions()`
`84`	`85`	`/// Unaltered meaning the file is identical in the working directory, the index and HEAD.`
`85`	`86`	`/// </remarks>`
`86`	`87`	`public bool IncludeUnaltered { get; set; }`
	`88`	`+`
	`89`	`+ /// <summary>`
	`90`	`+ /// Include ignored files when scanning for status`
	`91`	`+ /// </summary>`
	`92`	`+ /// <remarks>`
	`93`	`+ /// ignored meaning present in .gitignore. Defaults to true for back compat but may improve perf to not include if you have thousands of ignored files.`
	`94`	`+ /// </remarks>`
	`95`	`+ public bool IncludeIgnored { get; set; }`
	`96`	`+`
`87`	`97`	`}`
`88`	`98`	`}`