From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Aug 2017 21:33:42 +0000 (-0700)
Subject: Merge branch 'jk/ref-filter-colors' into maint
X-Git-Tag: v2.14.2~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/447f80f508509c7252c2f531724b90f75d3e4a26

Merge branch 'jk/ref-filter-colors' into maint

"%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()
---

447f80f508509c7252c2f531724b90f75d3e4a26