summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-14 08:15:40 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-14 08:15:43 -0800
commit0a9a787fca09878f993ad37c71a9646277222a6b (patch)
tree3d8649f52290902bd73974ea62f1cd44a192834c /wt-status.c
parent94383a813570c254101ffd729dd8251db5fe8044 (diff)
parenta45fb697f13bb789aca930ce786cf416ef1ecd0e (diff)
downloadgit-0a9a787fca09878f993ad37c71a9646277222a6b.tar.gz
Merge branch 'ap/status-ignored-in-ignored-directory'
Output from "git status --ignored" showed an unexpected interaction with "--untracked". * ap/status-ignored-in-ignored-directory: status: always report ignored tracked directories git-status: Test --ignored behavior dir.c: Make git-status --ignored more consistent
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 2a9658bad4..d7cfe8f31c 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];