author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 12 Apr 2007 21:32:21 +0000 (14:32 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 12 Apr 2007 23:23:25 +0000 (16:23 -0700) | ||
commit | ab22aed3b7517c6390cb622b368bfcf503b7a37a | |
tree | b9072c35c96cd6546a221ff1239b1eb9d7fc7500 | tree | snapshot |
parent | e011054b0fdcd1e29d85cdde7ffa5d5c125bd753 | commit | diff |
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>
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>
dir.c | diff | blob | history |