mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2017-10-18 14:20:43 +09:00
parent 4e4a0c6e79 b521fd1228
commit e3e3c6a43e
23 changed files with 103 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -92,7 +92,7 @@ static int git_branch_config(const char *var, const char *value, void *cb)
return config_error_nonbool(var);
return color_parse(value, branch_colors[slot]);
}
return git_default_config(var, value, cb);
return git_color_default_config(var, value, cb);
}
static const char *branch_get_color(enum color_branch ix)