summaryrefslogtreecommitdiff
path: root/builtin/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 01:19:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-18 01:19:08 (GMT)
commit1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch)
treeda278177d16ce137f6b19de518b149ba6edcbdca /builtin/tag.c
parent570676e011d9c8057744e03067553c4802e5adb4 (diff)
parentb521fd122865dca88b99d05344ec189d39efcefb (diff)
downloadgit-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.zip
git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.gz
git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.bz2
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/tag.c')
-rw-r--r--builtin/tag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index 695cb07..b38329b 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)