summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-05-08 04:55:35 -0400
committerJeff King <peff@peff.net>2012-05-08 04:55:35 -0400
commit5410ae422b0f3cfe604d393addcd13526e940112 (patch)
treee8273858fa5355dfefb5212eebd3289cfcf46c7d /wt-status.h
parenta3935e6791c619a9f2f472e9e553d45d88c4e263 (diff)
parentd4a6bf1fb64d904e210fbf7c5b330b06438a5bd5 (diff)
downloadgit-5410ae422b0f3cfe604d393addcd13526e940112.tar.gz
Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
* jk/maint-status-porcelain-z-b: status: respect "-b" for porcelain format status: fix null termination with "-b" status: refactor null_termination option commit: refactor option parsing Conflicts: wt-status.h
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/wt-status.h b/wt-status.h
index 6dd7207e25..f4c949bed2 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -57,6 +57,8 @@ struct wt_status {
const char *ignore_submodule_arg;
char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
int colopts;
+ int null_termination;
+ int show_branch;
/* These are computed during processing of the individual sections */
int commitable;
@@ -73,8 +75,8 @@ void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);
-void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch);
-void wt_porcelain_print(struct wt_status *s, int null_termination);
+void wt_shortstatus_print(struct wt_status *s);
+void wt_porcelain_print(struct wt_status *s);
void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...)
;