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

Don't show gitlink directories when we want "other" files

Browse Source 
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:
Linus Torvalds
2007-04-12 14:32:21 -07:00
committed by Junio C Hamano
parent e011054b0f
commit ab22aed3b7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dir.c
View File

@ -375,6 +375,8 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
return recurse_into_directory; return recurse_into_directory;
case index_gitdir: case index_gitdir:
if (dir->show_other_directories)
return ignore_directory;
return show_directory; return show_directory;
case index_nonexistent: case index_nonexistent: