diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 20:50:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 20:50:03 (GMT) |
| commit | f68b780b2575628eca75e9502e4997f98ad2af3b (patch) | |
| tree | 885194f0e88689e63ad9aa154485f795f1dc0ba3 /wt-status.h | |
| parent | b932c3c1c16844af9af2b71790caaca30546e99e (diff) | |
| parent | 148135fc24dce1e61cfd7fcedea4210095099e78 (diff) | |
| download | git-f68b780b2575628eca75e9502e4997f98ad2af3b.zip git-f68b780b2575628eca75e9502e4997f98ad2af3b.tar.gz git-f68b780b2575628eca75e9502e4997f98ad2af3b.tar.bz2 | |
Merge branch 'aa/status-hilite-branch'
* aa/status-hilite-branch:
default color.status.branch to "same as header"
status: show branchname with a configurable color
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wt-status.h b/wt-status.h index 9df9c9f..20b17cf 100644 --- a/wt-status.h +++ b/wt-status.h @@ -13,7 +13,9 @@ enum color_wt_status { WT_STATUS_NOBRANCH, WT_STATUS_UNMERGED, WT_STATUS_LOCAL_BRANCH, - WT_STATUS_REMOTE_BRANCH + WT_STATUS_REMOTE_BRANCH, + WT_STATUS_ONBRANCH, + WT_STATUS_MAXSLOT }; enum untracked_status_type { @@ -46,7 +48,7 @@ struct wt_status { int show_ignored_files; enum untracked_status_type show_untracked_files; const char *ignore_submodule_arg; - char color_palette[WT_STATUS_REMOTE_BRANCH+1][COLOR_MAXLEN]; + char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN]; /* These are computed during processing of the individual sections */ int commitable; |