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 | |
| 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')
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | builtin/clean.c | 3 | ||||
| -rw-r--r-- | builtin/grep.c | 2 | ||||
| -rw-r--r-- | builtin/show-branch.c | 2 | ||||
| -rw-r--r-- | builtin/tag.c | 2 |
5 files changed, 6 insertions, 5 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) diff --git a/builtin/clean.c b/builtin/clean.c index 733b6d3745..189e20628c 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -126,7 +126,8 @@ static int git_clean_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + /* inspect the color.ui config variable and others */ + return git_color_default_config(var, value, cb); } static const char *clean_get_color(enum color_clean ix) diff --git a/builtin/grep.c b/builtin/grep.c index 19e23946ac..2d65f27d01 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -275,7 +275,7 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { int st = grep_config(var, value, cb); - if (git_default_config(var, value, cb) < 0) + if (git_color_default_config(var, value, cb) < 0) st = -1; if (!strcmp(var, "grep.threads")) { diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 84547d6fba..6fa1f62a88 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -554,7 +554,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb) return 0; } - return git_default_config(var, value, cb); + return git_color_default_config(var, value, cb); } static int omit_in_dense(struct commit *commit, struct commit **rev, int n) diff --git a/builtin/tag.c b/builtin/tag.c index 695cb0778e..b38329b593 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -158,7 +158,7 @@ static int git_tag_config(const char *var, const char *value, void *cb) if (starts_with(var, "column.")) return git_column_config(var, value, "tag", &colopts); - return git_default_config(var, value, cb); + return git_color_default_config(var, value, cb); } static void write_tag_body(int fd, const struct object_id *oid) |