summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-10 15:17:37 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-10 15:17:37 -0700
commit4ab682e213d292fb921d21d25208a74ce47e2c19 (patch)
treed095749420ea7ee4ad09a91fc260121985db7e6d /log-tree.c
parent1165ae6f3d42e0eb0ddfc2d4e6dfa8bd0b88eb60 (diff)
parent5ee875852e3cb41c21c2e89a636fc1e40c4012b1 (diff)
downloadgit-4ab682e213d292fb921d21d25208a74ce47e2c19.tar.gz
Merge branch 'jc/decorate-leaky-separator-color' into HEAD
* jc/decorate-leaky-separator-color: log --decorate: do not leak "commit" color into the next item Documentation/config.txt: simplify boolean description in the syntax section Documentation/config.txt: describe 'color' value type in the "Values" section Documentation/config.txt: have a separate "Values" section Documentation/config.txt: describe the structure first and then meaning Documentation/config.txt: explain multi-valued variables once Documentation/config.txt: avoid unnecessary negation
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 7f0890e4ac..53bb52659b 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -195,6 +195,7 @@ void format_decorations_extended(struct strbuf *sb,
while (decoration) {
strbuf_addstr(sb, color_commit);
strbuf_addstr(sb, prefix);
+ strbuf_addstr(sb, color_reset);
strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
if (decoration->type == DECORATION_REF_TAG)
strbuf_addstr(sb, "tag: ");