Revert "dir: update stale description of treat_directory()"
This reverts commit 4e689d81718eb6e939cace317ea3e33cb994dcbb, to be replaced with a reworked version.
Junio C Hamano committed
May 27, 2021 at 14:00 UTC
2c9f1bfdb47acde21052bb33ff083347cbcb574d
1 file changed
+7
-6
dir.c
+7
-6
@@ -1740,13 +1740,13 @@ static enum exist_status directory_exists_in_index(struct index_state *istate,
1740
* Case 3: if we didn't have it in the index previously, we
1741
* have a few sub-cases:
1742
*
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
1745
* also true, in which case we need to check if it contains any
1746
* 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.
1750
* (c) otherwise, we recurse into it.
1751
*/
1752
static enum path_treatment treat_directory(struct dir_struct *dir,
@@ -1834,6 +1834,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
1834
return path_recurse;
1835
}
1836
1837
+ /* This is the "show_other_directories" case */
1838
assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES);
1839
1840
/*
@@ -1848,7 +1849,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
1849
/* Special cases for where this directory is excluded/ignored */
1850
if (excluded) {
1851
/*
1851
- * If DIR_SHOW_OTHER_DIRECTORIES is set and we're not
1852
+ * In the show_other_directories case, if we're not
1853
* hiding empty directories, there is no need to
1854
* recurse into an ignored directory.
1855
*/