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>
This commit is contained in:
parent
3fe2a894e9
commit
4a7cc2fdf3
@ -382,7 +382,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
|
||||
wt_shortstatus_print(s, null_termination);
|
||||
break;
|
||||
case STATUS_FORMAT_PORCELAIN:
|
||||
wt_shortstatus_print(s, null_termination);
|
||||
wt_porcelain_print(s, null_termination);
|
||||
break;
|
||||
case STATUS_FORMAT_LONG:
|
||||
wt_status_print(s);
|
||||
@ -975,7 +975,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
||||
wt_shortstatus_print(&s, null_termination);
|
||||
break;
|
||||
case STATUS_FORMAT_PORCELAIN:
|
||||
wt_shortstatus_print(&s, null_termination);
|
||||
wt_porcelain_print(&s, null_termination);
|
||||
break;
|
||||
case STATUS_FORMAT_LONG:
|
||||
s.verbose = verbose;
|
||||
|
@ -688,3 +688,9 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
|
||||
wt_shortstatus_untracked(null_termination, it, s);
|
||||
}
|
||||
}
|
||||
|
||||
void wt_porcelain_print(struct wt_status *s, int null_termination)
|
||||
{
|
||||
s->use_color = 0;
|
||||
wt_shortstatus_print(s, null_termination);
|
||||
}
|
||||
|
@ -57,5 +57,6 @@ 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);
|
||||
void wt_porcelain_print(struct wt_status *s, int null_termination);
|
||||
|
||||
#endif /* STATUS_H */
|
||||
|
Loading…
Reference in New Issue
Block a user