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

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

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.

Let's run with this one.

* 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"
This commit is contained in:
Junio C Hamano
2017-10-18 10:19:08 +09:00
parent 570676e011 b521fd1228
commit 1c0b983a77
12 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
color.c
View File

@ -308,7 +308,7 @@ int git_config_colorbool(const char *var, const char *value)
if (!strcasecmp(value, "never"))
return 0;
if (!strcasecmp(value, "always"))
return var ? GIT_COLOR_AUTO : 1;
return 1;
if (!strcasecmp(value, "auto"))
return GIT_COLOR_AUTO;
}
@ -368,6 +368,14 @@ int git_color_config(const char *var, const char *value, void *cb)
return 0;
}
int git_color_default_config(const char *var, const char *value, void *cb)
{
if (git_color_config(var, value, cb) < 0)
return -1;
return git_default_config(var, value, cb);
}
void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb)
{
if (*color)