diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
| commit | 15595ce438d0ce8b195187f00663baa407a2d024 (patch) | |
| tree | 2f45fe0449cc6f272e0f668e5cb388ed66c4858d /builtin/rev-list.c | |
| parent | Merge branch 'wd/rebase-conflict-guide' (diff) | |
| parent | ref-filter: consult want_color() before emitting colors (diff) | |
| download | tgif-15595ce438d0ce8b195187f00663baa407a2d024.tar.xz | |
Merge branch 'jk/ref-filter-colors'
"%C(color name)" in the pretty print format always produced ANSI
color escape codes, which was an early design mistake. They now
honor the configuration (e.g. "color.ui = never") and also tty-ness
of the output medium.
* jk/ref-filter-colors:
ref-filter: consult want_color() before emitting colors
pretty: respect color settings for %C placeholders
rev-list: pass diffopt->use_colors through to pretty-print
for-each-ref: load config earlier
color: check color.ui in git_default_config()
ref-filter: pass ref_format struct to atom parsers
ref-filter: factor out the parsing of sorting atoms
ref-filter: make parse_ref_filter_atom a private function
ref-filter: provide a function for parsing sort options
ref-filter: move need_color_reset_at_eol into ref_format
ref-filter: abstract ref format into its own struct
ref-filter: simplify automatic color reset
t: use test_decode_color rather than literal ANSI codes
docs/for-each-ref: update pointer to color syntax
check return value of verify_ref_format()
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 95d84d5cda..fee10d8567 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -122,6 +122,7 @@ static void show_commit(struct commit *commit, void *data) ctx.date_mode_explicit = revs->date_mode_explicit; ctx.fmt = revs->commit_format; ctx.output_encoding = get_log_output_encoding(); + ctx.color = revs->diffopt.use_color; pretty_print_commit(&ctx, commit, &buf); if (buf.len) { if (revs->commit_format != CMIT_FMT_ONELINE) |