Teach Index.Stage to stage files in ignored dirs

Edward Thomson · Edward Thomson · commit 885de34f5444 · 2013-08-25T00:58:18.000-05:00
If a directory is ignored and you attempt to stage
a file beneath that directory, the file is not
staged.  By having diff return files beneath that
ignored dir, we can add that file.
diff --git a/LibGit2Sharp.Tests/StageFixture.cs b/LibGit2Sharp.Tests/StageFixture.cs
@@ -298,5 +298,21 @@ public void CanStageWithMultiplePathspecs()
                 Assert.Equal(count, repo.Index.Count);  // 1 added file, 1 deleted file, so same count
             }
         }
+
+        [Theory]
+        [InlineData("ignored_file.txt")]
+        [InlineData("ignored_folder/file.txt")]
+        public void CanStageIgnoredPaths(string path)
+        {
+            using (var repo = new Repository(CloneStandardTestRepo()))
+            {
+                Touch(repo.Info.WorkingDirectory, ".gitignore", "ignored_file.txt\nignored_folder/\n");
+                Touch(repo.Info.WorkingDirectory, path, "This file is ignored.");
+
+                Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus(path));
+                repo.Index.Stage(path);
+                Assert.Equal(FileStatus.Added, repo.Index.RetrieveStatus(path));
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs
@@ -111,6 +111,13 @@ internal enum GitDiffOptionFlags
         /// Ignore file mode changes.
         /// </summary>
         GIT_DIFF_IGNORE_FILEMODE = (1 << 17),
+
+        /// <summary>
+        /// Even with GIT_DIFF_INCLUDE_IGNORED, an entire ignored directory
+        /// will be marked with only a single entry in the diff list; this flag
+        /// adds all files under the directory as IGNORED entries, too.
+        /// </summary>
+        GIT_DIFF_RECURSE_IGNORED_DIRS = (1 << 18),
     }
 
     internal delegate int diff_notify_cb(
diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
@@ -38,7 +38,8 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
 
             if (diffOptions.HasFlag(DiffModifiers.IncludeIgnored))
             {
-                options.Flags |= GitDiffOptionFlags.GIT_DIFF_INCLUDE_IGNORED;
+                options.Flags |= GitDiffOptionFlags.GIT_DIFF_INCLUDE_IGNORED |
+                GitDiffOptionFlags.GIT_DIFF_RECURSE_IGNORED_DIRS;
             }
 
             if (diffOptions.HasFlag(DiffModifiers.IncludeUnmodified))

Original file line number	Diff line number	Diff line change
`@@ -298,5 +298,21 @@ public void CanStageWithMultiplePathspecs()`
`298`	`298`	`Assert.Equal(count, repo.Index.Count); // 1 added file, 1 deleted file, so same count`
`299`	`299`	`}`
`300`	`300`	`}`
	`301`	`+`
	`302`	`+ [Theory]`
	`303`	`+ [InlineData("ignored_file.txt")]`
	`304`	`+ [InlineData("ignored_folder/file.txt")]`
	`305`	`+ public void CanStageIgnoredPaths(string path)`
	`306`	`+ {`
	`307`	`+ using (var repo = new Repository(CloneStandardTestRepo()))`
	`308`	`+ {`
	`309`	`+ Touch(repo.Info.WorkingDirectory, ".gitignore", "ignored_file.txt\nignored_folder/\n");`
	`310`	`+ Touch(repo.Info.WorkingDirectory, path, "This file is ignored.");`
	`311`	`+`
	`312`	`+ Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus(path));`
	`313`	`+ repo.Index.Stage(path);`
	`314`	`+ Assert.Equal(FileStatus.Added, repo.Index.RetrieveStatus(path));`
	`315`	`+ }`
	`316`	`+ }`
`301`	`317`	`}`
`302`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]`
`38`	`38`
`39`	`39`	`if (diffOptions.HasFlag(DiffModifiers.IncludeIgnored))`
`40`	`40`	`{`
`41`		`- options.Flags \|= GitDiffOptionFlags.GIT_DIFF_INCLUDE_IGNORED;`
	`41`	`+ options.Flags \|= GitDiffOptionFlags.GIT_DIFF_INCLUDE_IGNORED \|`
	`42`	`+ GitDiffOptionFlags.GIT_DIFF_RECURSE_IGNORED_DIRS;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`if (diffOptions.HasFlag(DiffModifiers.IncludeUnmodified))`