diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 10:19:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 10:19:08 +0900 |
| commit | 1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch) | |
| tree | da278177d16ce137f6b19de518b149ba6edcbdca /builtin/branch.c | |
| parent | 570676e011d9c8057744e03067553c4802e5adb4 (diff) | |
| parent | b521fd122865dca88b99d05344ec189d39efcefb (diff) | |
| download | git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.gz | |
Merge branch 'jk/ref-filter-colors-fix'
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"
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index b67593288c..79dc9181fd 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -93,7 +93,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) |