diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:16 -0700 |
| commit | cd4ce1e8a81ef5c24af7b914fb72212273e7d489 (patch) | |
| tree | f92ec5eee5cf02b429ff9a9002b29e663e5eea38 /wt-status.h | |
| parent | Merge branch 'np/malloc-threading' (diff) | |
| parent | wt-status: fix 'fprintf' compilation warning (diff) | |
| download | tgif-cd4ce1e8a81ef5c24af7b914fb72212273e7d489.tar.xz | |
Merge branch 'jc/status-show-ignored'
* jc/status-show-ignored:
wt-status: fix 'fprintf' compilation warning
status: --ignored option shows ignored files
wt-status: rename and restructure status-print-untracked
wt-status: collect ignored files
wt-status: plug memory leak while collecting untracked files
wt-status: remove unused workdir_untracked member
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h index 91206739f3..1093e65ae0 100644 --- a/wt-status.h +++ b/wt-status.h @@ -41,18 +41,19 @@ struct wt_status { int use_color; int relative_paths; int submodule_summary; + int show_ignored_files; enum untracked_status_type show_untracked_files; char color_palette[WT_STATUS_UNMERGED+1][COLOR_MAXLEN]; /* These are computed during processing of the individual sections */ int commitable; int workdir_dirty; - int workdir_untracked; const char *index_file; FILE *fp; const char *prefix; struct string_list change; struct string_list untracked; + struct string_list ignored; }; void wt_status_prepare(struct wt_status *s); |