rerere: write out each record of MERGE_RR in one go

diff --git a/log-tree.c b/log-tree.c
index cff7ac1dbd8942f3013e6fa91d30d2ea33495854..53bb52659b41c5a2fddc61af05a3a2ef90528b15 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -56,15 +56,14 @@ static int parse_decorate_color_slot(const char *slot)
        return -1;
 }
 
-int parse_decorate_color_config(const char *var, const int ofs, const char *value)
+int parse_decorate_color_config(const char *var, const char *slot_name, const char *value)
 {
-       int slot = parse_decorate_color_slot(var + ofs);
+       int slot = parse_decorate_color_slot(slot_name);
        if (slot < 0)
                return 0;
        if (!value)
                return config_error_nonbool(var);
-       color_parse(value, var, decoration_colors[slot]);
-       return 0;
+       return color_parse(value, decoration_colors[slot]);
 }
 
 /*
@@ -196,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: ");