Skip to content

Commit f0a126c

Browse files
committed
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]>
1 parent 8d74ef6 commit f0a126c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Documentation/technical/api-directory-listing.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ The notable options are:
3535

3636
`DIR_SHOW_IGNORED_DIRECTORY`:::
3737

38-
3938
(EXPERIMENTAL) If this is set, non-empty directories that match an ignore pattern are
4039
returned. The individual files contained in ignored directories are not
4140
included.

dir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,9 +1417,9 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
14171417
return exclude ? path_excluded : path_untracked;
14181418

14191419
untracked = lookup_untracked(dir->untracked, untracked,
1420-
dirname + baselen, len - baselen);
1420+
dirname + baselen, len - baselen);
14211421
return read_directory_recursive(dir, istate, dirname, len,
1422-
untracked, 1, 0, pathspec);
1422+
untracked, 1, 0, pathspec);
14231423
}
14241424

14251425

0 commit comments

Comments
 (0)