mirror of
https://github.com/git/git.git
synced 2024-11-18 17:23:49 +01:00
Don't show gitlink directories when we want "other" files
When "show_other_directories" is set, that implies that we are looking for untracked files, which obviously means that we should ignore directories that are marked as gitlinks in the index. This fixes "git status" in a superproject, that would otherwise always report that subprojects were "Untracked files:" Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e011054b0f
commit
ab22aed3b7
2
dir.c
2
dir.c
@ -375,6 +375,8 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
|
||||
return recurse_into_directory;
|
||||
|
||||
case index_gitdir:
|
||||
if (dir->show_other_directories)
|
||||
return ignore_directory;
|
||||
return show_directory;
|
||||
|
||||
case index_nonexistent:
|
||||
|
Loading…
Reference in New Issue
Block a user