Merge remote-tracking branch 'origin/pr/1393'

ethomson · ethomson · commit 8deaf1e8ccdf · 2017-06-24T19:11:36.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,10 @@
 
 ### Changes
 
+ - Status now does not show untracked files by default.  To retrieve
+   untracked files, included the `StatusOptions.IncludeUntracked` and/or
+   the `StatusOptions.RecurseUntrackedDirs` options.
+
 ### Fixes
 
  - The exception thrown when the native library cannot be loaded is now
diff --git a/LibGit2Sharp/RepositoryStatus.cs b/LibGit2Sharp/RepositoryStatus.cs
@@ -78,16 +78,18 @@ private static GitStatusOptions CreateStatusOptions(StatusOptions options)
             {
                 Version = 1,
                 Show = (GitStatusShow)options.Show,
-                Flags =
-                    GitStatusOptionFlags.IncludeUntracked |
-                    GitStatusOptionFlags.RecurseUntrackedDirs,
             };
 
             if (options.IncludeIgnored)
             {
                 coreOptions.Flags |= GitStatusOptionFlags.IncludeIgnored;
             }
 
+            if (options.IncludeUntracked)
+            {
+                coreOptions.Flags |= GitStatusOptionFlags.IncludeUntracked;
+            }
+
             if (options.DetectRenamesInIndex)
             {
                 coreOptions.Flags |=
@@ -114,6 +116,12 @@ private static GitStatusOptions CreateStatusOptions(StatusOptions options)
                     GitStatusOptionFlags.RecurseIgnoredDirs;
             }
 
+            if (options.RecurseUntrackedDirs)
+            {
+                coreOptions.Flags |=
+                    GitStatusOptionFlags.RecurseUntrackedDirs;
+            }
+
             if (options.PathSpec != null)
             {
                 coreOptions.PathSpec = GitStrArrayManaged.BuildFrom(options.PathSpec);
diff --git a/LibGit2Sharp/StatusOptions.cs b/LibGit2Sharp/StatusOptions.cs
@@ -36,6 +36,8 @@ public StatusOptions()
         {
             DetectRenamesInIndex = true;
             IncludeIgnored = true;
+            IncludeUntracked = true;
+            RecurseUntrackedDirs = true;
         }
 
         /// <summary>
@@ -63,6 +65,11 @@ public StatusOptions()
         /// </summary>
         public bool RecurseIgnoredDirs { get; set; }
 
+        /// <summary>
+        /// Recurse into untracked directories
+        /// </summary>
+        public bool RecurseUntrackedDirs { get; set; }
+
         /// <summary>
         /// Limit the scope of paths to consider to the provided pathspecs
         /// </summary>
@@ -94,5 +101,9 @@ public StatusOptions()
         /// </remarks>
         public bool IncludeIgnored { get; set; }
 
+        /// <summary>
+        /// Include untracked files when scanning for status
+        /// </summary>
+        public bool IncludeUntracked { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,18 @@ private static GitStatusOptions CreateStatusOptions(StatusOptions options)`
`78`	`78`	`{`
`79`	`79`	`Version = 1,`
`80`	`80`	`Show = (GitStatusShow)options.Show,`
`81`		`- Flags =`
`82`		`- GitStatusOptionFlags.IncludeUntracked \|`
`83`		`- GitStatusOptionFlags.RecurseUntrackedDirs,`
`84`	`81`	`};`
`85`	`82`
`86`	`83`	`if (options.IncludeIgnored)`
`87`	`84`	`{`
`88`	`85`	`coreOptions.Flags \|= GitStatusOptionFlags.IncludeIgnored;`
`89`	`86`	`}`
`90`	`87`
	`88`	`+ if (options.IncludeUntracked)`
	`89`	`+ {`
	`90`	`+ coreOptions.Flags \|= GitStatusOptionFlags.IncludeUntracked;`
	`91`	`+ }`
	`92`	`+`
`91`	`93`	`if (options.DetectRenamesInIndex)`
`92`	`94`	`{`
`93`	`95`	`coreOptions.Flags \|=`
`@@ -114,6 +116,12 @@ private static GitStatusOptions CreateStatusOptions(StatusOptions options)`
`114`	`116`	`GitStatusOptionFlags.RecurseIgnoredDirs;`
`115`	`117`	`}`
`116`	`118`
	`119`	`+ if (options.RecurseUntrackedDirs)`
	`120`	`+ {`
	`121`	`+ coreOptions.Flags \|=`
	`122`	`+ GitStatusOptionFlags.RecurseUntrackedDirs;`
	`123`	`+ }`
	`124`	`+`
`117`	`125`	`if (options.PathSpec != null)`
`118`	`126`	`{`
`119`	`127`	`coreOptions.PathSpec = GitStrArrayManaged.BuildFrom(options.PathSpec);`