aboutsummaryrefslogtreecommitdiffstats
path: root/pretty.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-09-17 20:25:24 +0200
committerJunio C Hamano <gitster@pobox.com>2016-09-19 10:50:32 -0700
commitc99ad274b196bc97f22c1c39178784668cb4623d (patch)
tree6c3ebbcffc1d0c3a33cace1b46fa0539e211090a /pretty.c
parentb15a3e005af07843116c73205742adfbab3d2e82 (diff)
downloadgit-c99ad274b196bc97f22c1c39178784668cb4623d.tar.gz
pretty: let %C(auto) reset all attributes
Reset colors and attributes upon %C(auto) to enable full automatic control over them; otherwise attributes like bold or reverse could still be in effect from previous %C placeholders. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index 3908e8f100..b86c5bb907 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1062,6 +1062,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
case 'C':
if (starts_with(placeholder + 1, "(auto)")) {
c->auto_color = want_color(c->pretty_ctx->color);
+ if (c->auto_color)
+ strbuf_addstr(sb, GIT_COLOR_RESET);
return 7; /* consumed 7 bytes, "C(auto)" */
} else {
int ret = parse_color(sb, placeholder, c);