From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Oct 2017 03:03:05 +0000 (+0900)
Subject: Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
X-Git-Tag: v2.15.0-rc1~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aebd23506ec952c1ca68d577afc59d3e2f7bd7ce;p=thirdparty%2Fgit.git

Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto

* jk/ui-color-always-to-auto-maint:
  color: make "always" the same as "auto" in config
  provide --color option for all ref-filter users
  t3205: use --color instead of color.branch=always
  t3203: drop "always" color test
  t6006: drop "always" color config tests
  t7502: use diff.noprefix for --verbose test
  t7508: use test_terminal for color output
  t3701: use test-terminal to collect color output
  t4015: prefer --color to -c color.diff=always
  test-terminal: set TERM=vt100
---

aebd23506ec952c1ca68d577afc59d3e2f7bd7ce
diff --cc Documentation/git-for-each-ref.txt
index 66b4e0a405,b92ebd0cd9..cbd0a6212a
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@@ -57,6 -49,17 +57,11 @@@ OPTION
  	`xx`; for example `%00` interpolates to `\0` (NUL),
  	`%09` to `\t` (TAB) and `%0a` to `\n` (LF).
  
 -<pattern>...::
 -	If one or more patterns are given, only refs are shown that
 -	match against at least one pattern, either using fnmatch(3) or
 -	literally, in the latter case matching completely or from the
 -	beginning up to a slash.
 -
+ --color[=<when>]:
+ 	Respect any colors specified in the `--format` option. The
+ 	`<when>` field must be one of `always`, `never`, or `auto` (if
+ 	`<when>` is absent, behave as if `always` was given).
+ 
  --shell::
  --perl::
  --python::
diff --cc t/t7301-clean-interactive.sh
index 39212dccd2,3ae394e934..1bf9789c8a
--- a/t/t7301-clean-interactive.sh
+++ b/t/t7301-clean-interactive.sh
@@@ -473,14 -472,4 +473,14 @@@ test_expect_success 'git clean -id wit
  
  '
  
 +test_expect_success TTY 'git clean -i paints the header in HEADER color' '
 +	>a.out &&
 +	echo q |
- 	test_terminal env TERM=vt100 git clean -i |
++	test_terminal git clean -i |
 +	test_decode_color |
 +	head -n 1 >header &&
 +	# not i18ngrep
 +	grep "^<BOLD>" header
 +'
 +
  test_done