From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:26:58 +0000 (-0700)
Subject: Merge branch 'jk/ref-filter-colors'
X-Git-Tag: v2.15.0-rc0~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15595ce438d0ce8b195187f00663baa407a2d024;p=thirdparty%2Fgit.git

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

15595ce438d0ce8b195187f00663baa407a2d024
diff --cc builtin/tag.c
index b25bf8daa2,66e35b823b..e8a30e6110
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@@ -105,17 -107,17 +107,17 @@@ static int verify_tag(const char *name
  		      const struct object_id *oid, const void *cb_data)
  {
  	int flags;
- 	const char *fmt_pretty = cb_data;
+ 	const struct ref_format *format = cb_data;
  	flags = GPG_VERIFY_VERBOSE;
  
- 	if (fmt_pretty)
+ 	if (format->format)
  		flags = GPG_VERIFY_OMIT_STATUS;
  
 -	if (gpg_verify_tag(oid->hash, name, flags))
 +	if (gpg_verify_tag(oid, name, flags))
  		return -1;
  
- 	if (fmt_pretty)
- 		pretty_print_ref(name, oid->hash, fmt_pretty);
+ 	if (format->format)
+ 		pretty_print_ref(name, oid->hash, format);
  
  	return 0;
  }
diff --cc builtin/verify-tag.c
index ed8329340f,87d73e856a..ad7b79fa5c
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@@ -69,8 -70,8 +71,8 @@@ int cmd_verify_tag(int argc, const cha
  			continue;
  		}
  
- 		if (fmt_pretty)
- 			pretty_print_ref(name, oid.hash, fmt_pretty);
+ 		if (format.format)
 -			pretty_print_ref(name, sha1, &format);
++			pretty_print_ref(name, oid.hash, &format);
  	}
  	return had_error;
  }