mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "dir: update stale description of treat_directory()"

Browse Source 
This reverts commit 4e689d8171,
to be replaced with a reworked version.
This commit is contained in:
Junio C Hamano
2021-05-27 14:00:00 +09:00
parent 1df046bcff
commit 2c9f1bfdb4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dir.c
View File

@ -1740,13 +1740,13 @@ static enum exist_status directory_exists_in_index(struct index_state *istate,
* Case 3: if we didn't have it in the index previously, we * Case 3: if we didn't have it in the index previously, we
* have a few sub-cases: * have a few sub-cases:
* *
* (a) if DIR_SHOW_OTHER_DIRECTORIES flag is set, we show it as * (a) if "show_other_directories" is true, we show it as
* just a directory, unless DIR_HIDE_EMPTY_DIRECTORIES is * just a directory, unless "hide_empty_directories" is
* also true, in which case we need to check if it contains any * also true, in which case we need to check if it contains any
* untracked and / or ignored files. * untracked and / or ignored files.
* (b) if it looks like a git directory and we don't have the * (b) if it looks like a git directory, and we don't have
* DIR_NO_GITLINKS flag, then we treat it as a gitlink, and * 'no_gitlinks' set we treat it as a gitlink, and show it
* show it as a directory. * as a directory.
* (c) otherwise, we recurse into it. * (c) otherwise, we recurse into it.
*/ */
static enum path_treatment treat_directory(struct dir_struct *dir, static enum path_treatment treat_directory(struct dir_struct *dir,
@ -1834,6 +1834,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
return path_recurse; return path_recurse;
} }
/* This is the "show_other_directories" case */
assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES); assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES);
/* /*
@ -1848,7 +1849,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
/* Special cases for where this directory is excluded/ignored */ /* Special cases for where this directory is excluded/ignored */
if (excluded) { if (excluded) {
/* /*
* If DIR_SHOW_OTHER_DIRECTORIES is set and we're not * In the show_other_directories case, if we're not
* hiding empty directories, there is no need to * hiding empty directories, there is no need to
* recurse into an ignored directory. * recurse into an ignored directory.
*/ */