undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status: disable color for porcelain format

Browse Source 
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:
Jeff King 2009-12-07 00:17:15 -05:00 committed by Junio C Hamano
parent 3fe2a894e9
commit 4a7cc2fdf3
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-commit.c
View File

@ -382,7 +382,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
wt_shortstatus_print(s, null_termination); wt_shortstatus_print(s, null_termination);
break; break;
case STATUS_FORMAT_PORCELAIN: case STATUS_FORMAT_PORCELAIN:
wt_shortstatus_print(s, null_termination); wt_porcelain_print(s, null_termination);
break; break;
case STATUS_FORMAT_LONG: case STATUS_FORMAT_LONG:
wt_status_print(s); 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); wt_shortstatus_print(&s, null_termination);
break; break;
case STATUS_FORMAT_PORCELAIN: case STATUS_FORMAT_PORCELAIN:
wt_shortstatus_print(&s, null_termination); wt_porcelain_print(&s, null_termination);
break; break;
case STATUS_FORMAT_LONG: case STATUS_FORMAT_LONG:
s.verbose = verbose; s.verbose = verbose;

6
wt-status.c
View File

@ -688,3 +688,9 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
wt_shortstatus_untracked(null_termination, it, s); 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);
}

1
wt-status.h
View File

@ -57,5 +57,6 @@ void wt_status_print(struct wt_status *s);
void wt_status_collect(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_shortstatus_print(struct wt_status *s, int null_termination);
void wt_porcelain_print(struct wt_status *s, int null_termination);
#endif /* STATUS_H */ #endif /* STATUS_H */