summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/dir.c b/dir.c
index 66261cf..ed68b7e 100644
--- a/dir.c
+++ b/dir.c
@@ -1868,15 +1868,17 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
/*
* Other than the path_recurse case above, we only need to
- * recurse into untracked directories if either of the following
+ * recurse into untracked directories if any of the following
* bits is set:
- * - DIR_SHOW_IGNORED_TOO (because then we need to determine if
- * there are ignored entries below)
+ * - DIR_SHOW_IGNORED (because then we need to determine if
+ * there are ignored entries below)
+ * - DIR_SHOW_IGNORED_TOO (same as above)
* - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if
* the directory is empty)
*/
if (!excluded &&
- !(dir->flags & (DIR_SHOW_IGNORED_TOO |
+ !(dir->flags & (DIR_SHOW_IGNORED |
+ DIR_SHOW_IGNORED_TOO |
DIR_HIDE_EMPTY_DIRECTORIES))) {
return path_untracked;
}