X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=wt-status.c;h=d7cfe8f31cd3d2b4b8bdc18c5da2449255b0531b;hb=85fd059a89c7328ca37edd31f2d8daa4d0d61de5;hp=2a9658bad4c5035893e9363b51985f285dd3b34c;hpb=c25a3684f53a237ca5935c403936cb68809f0b0e;p=git-core%2Fgit.git

diff --git a/wt-status.c b/wt-status.c
index 2a9658bad..d7cfe8f31 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -516,7 +516,9 @@ static void wt_status_collect_untracked(struct wt_status *s)
 
 	if (s->show_ignored_files) {
 		dir.nr = 0;
-		dir.flags = DIR_SHOW_IGNORED | DIR_SHOW_OTHER_DIRECTORIES;
+		dir.flags = DIR_SHOW_IGNORED;
+		if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
+			dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 		fill_directory(&dir, s->pathspec);
 		for (i = 0; i < dir.nr; i++) {
 			struct dir_entry *ent = dir.entries[i];