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

This is the "theoretically more correct" approach of simply
stepping back to the state before plumbing commands started paying
attention to "color.ui" configuration variable.

* jk/ref-filter-colors-fix:
tag: respect color.ui config
Revert "color: check color.ui in git_default_config()"
Revert "t6006: drop "always" color config tests"
Revert "color: make "always" the same as "auto" in config"
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

diff --cc Documentation/git-for-each-ref.txt
index 66b4e0a4050655e7fab27a6fe72af03d6c99f3b2,8bbeeba2913d6ae79b9b5a88cd7e619baf7b9653..cbd0a6212a62a618252e7b56397239d4066dcbd7
--- 1/Documentation/git-for-each-ref.txt
--- 2/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@@ -57,6 -50,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 Documentation/git-tag.txt
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc config.c
Simple merge

diff --cc t/t6300-for-each-ref.sh
Simple merge