Skip to content

Commit 2c9f1bf

Browse files
committed
Revert "dir: update stale description of treat_directory()"
This reverts commit 4e689d8, to be replaced with a reworked version.
1 parent 1df046b commit 2c9f1bf

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

dir.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,13 +1740,13 @@ static enum exist_status directory_exists_in_index(struct index_state *istate,
17401740
* Case 3: if we didn't have it in the index previously, we
17411741
* have a few sub-cases:
17421742
*
1743-
* (a) if DIR_SHOW_OTHER_DIRECTORIES flag is set, we show it as
1744-
* just a directory, unless DIR_HIDE_EMPTY_DIRECTORIES is
1743+
* (a) if "show_other_directories" is true, we show it as
1744+
* just a directory, unless "hide_empty_directories" is
17451745
* also true, in which case we need to check if it contains any
17461746
* untracked and / or ignored files.
1747-
* (b) if it looks like a git directory and we don't have the
1748-
* DIR_NO_GITLINKS flag, then we treat it as a gitlink, and
1749-
* show it as a directory.
1747+
* (b) if it looks like a git directory, and we don't have
1748+
* 'no_gitlinks' set we treat it as a gitlink, and show it
1749+
* as a directory.
17501750
* (c) otherwise, we recurse into it.
17511751
*/
17521752
static enum path_treatment treat_directory(struct dir_struct *dir,
@@ -1834,6 +1834,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
18341834
return path_recurse;
18351835
}
18361836

1837+
/* This is the "show_other_directories" case */
18371838
assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES);
18381839

18391840
/*
@@ -1848,7 +1849,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
18481849
/* Special cases for where this directory is excluded/ignored */
18491850
if (excluded) {
18501851
/*
1851-
* If DIR_SHOW_OTHER_DIRECTORIES is set and we're not
1852+
* In the show_other_directories case, if we're not
18521853
* hiding empty directories, there is no need to
18531854
* recurse into an ignored directory.
18541855
*/

0 commit comments

Comments
 (0)