diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:10:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:10:25 -0800 |
| commit | 85fd059a89c7328ca37edd31f2d8daa4d0d61de5 (patch) | |
| tree | af771f6556d0a225b171878719f67ceb0c02031d /wt-status.c | |
| parent | 3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78 (diff) | |
| parent | a45fb697f13bb789aca930ce786cf416ef1ecd0e (diff) | |
| download | git-85fd059a89c7328ca37edd31f2d8daa4d0d61de5.tar.gz git-85fd059a89c7328ca37edd31f2d8daa4d0d61de5.tar.xz | |
Merge branch 'ap/status-ignored-in-ignored-directory' into maint
Output from "git status --ignored" did not work well when used 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.c | 4 |
1 files changed, 3 insertions, 1 deletions
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]; |