status: disable color for porcelain format
The porcelain format is identical to the shortstatus format, except that it should not respect any user configuration, including color. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 7, 2009 at 00:17 UTC
4a7cc2fdf39c90e6eff84d30b86490cac2c33705
3 files changed
+9
-2
builtin-commit.c
+2
-2
@@ -382,7 +382,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
382
wt_shortstatus_print(s, null_termination);
383
break;
384
case STATUS_FORMAT_PORCELAIN:
385
- wt_shortstatus_print(s, null_termination);
385
+ wt_porcelain_print(s, null_termination);
386
break;
387
case STATUS_FORMAT_LONG:
388
wt_status_print(s);
@@ -975,7 +975,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
975
wt_shortstatus_print(&s, null_termination);
976
break;
977
case STATUS_FORMAT_PORCELAIN:
978
- wt_shortstatus_print(&s, null_termination);
978
+ wt_porcelain_print(&s, null_termination);
979
break;
980
case STATUS_FORMAT_LONG:
981
s.verbose = verbose;
wt-status.c
+6
@@ -688,3 +688,9 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
688
wt_shortstatus_untracked(null_termination, it, s);
689
}
690
}
691
+
692
+void wt_porcelain_print(struct wt_status *s, int null_termination)
693
+{
694
+ s->use_color = 0;
695
+ wt_shortstatus_print(s, null_termination);
696
+}
wt-status.h
+1
@@ -57,5 +57,6 @@ void wt_status_print(struct wt_status *s);
57
void wt_status_collect(struct wt_status *s);
58
59
void wt_shortstatus_print(struct wt_status *s, int null_termination);
60
+void wt_porcelain_print(struct wt_status *s, int null_termination);
61
62
#endif /* STATUS_H */