Skip to content
Permalink
Browse files

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 <johannes.schindelin@gmx.de>
  • Loading branch information...
dscho committed Aug 5, 2017
1 parent 8d74ef6 commit f0a126c029001ff16e6d8d9ebdcc6d14fd8e06a5
Showing with 2 additions and 3 deletions.
  1. +0 −1 Documentation/technical/api-directory-listing.txt
  2. +2 −2 dir.c
@@ -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.
4 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);
}


0 comments on commit f0a126c

Please sign in to comment.
You can’t perform that action at this time.