File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -1820,7 +1820,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
1820
1820
* to recurse into untracked/ignored directories if either of the
1821
1821
* following bits is set:
1822
1822
* - DIR_SHOW_IGNORED_TOO (because then we need to determine if
1823
- * there are ignored directories below)
1823
+ * there are ignored entries below)
1824
1824
* - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if
1825
1825
* the directory is empty)
1826
1826
*/
@@ -1838,10 +1838,11 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
1838
1838
return path_excluded ;
1839
1839
1840
1840
/*
1841
- * If we have we don't want to know the all the paths under an
1842
- * untracked or ignored directory, we still need to go into the
1843
- * directory to determine if it is empty (because an empty directory
1844
- * should be path_none instead of path_excluded or path_untracked).
1841
+ * Even if we don't want to know all the paths under an untracked or
1842
+ * ignored directory, we may still need to go into the directory to
1843
+ * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES,
1844
+ * an empty directory should be path_none instead of path_excluded or
1845
+ * path_untracked).
1845
1846
*/
1846
1847
check_only = ((dir -> flags & DIR_HIDE_EMPTY_DIRECTORIES ) &&
1847
1848
!(dir -> flags & DIR_SHOW_IGNORED_TOO ));
You can’t perform that action at this time.
0 commit comments