Skip to content

Commit

Permalink
fixup! Teach status to show ignored directories with all untracked files
Browse files Browse the repository at this point in the history
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 f0a126c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion Documentation/technical/api-directory-listing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down

0 comments on commit f0a126c

Please sign in to comment.