fixup! Teach status to show ignored directories with all untracked files

It is totally my fault that I failed to notice the updated PR at #1243. This backports the fixes into the next Git for Windows version's commit graph. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Aug 5, 2017 · f0a126c · f0a126c
1 parent 8d74ef6
commit f0a126c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt
@@ -35,7 +35,6 @@ The notable options are:
 
 `DIR_SHOW_IGNORED_DIRECTORY`:::
 
-
 	(EXPERIMENTAL) If this is set, non-empty directories that match an ignore pattern are
 	returned. The individual files contained in ignored directories are not
 	included.

diff --git a/dir.c b/dir.c
@@ -1417,9 +1417,9 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 		return exclude ? path_excluded : path_untracked;
 
 	untracked = lookup_untracked(dir->untracked, untracked,
-			dirname + baselen, len - baselen);
+				     dirname + baselen, len - baselen);
 	return read_directory_recursive(dir, istate, dirname, len,
-			untracked, 1, 0, pathspec);
+					untracked, 1, 0, pathspec);
 }