fmt-merge-msg: use core.commentchar in tag signatures completely
Commit eff80a9 (Allow custom "comment char") introduced a custom comment character for commit messages but didn't use it completely in the tag signature part. This commit fixes that. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow committed
Apr 7, 2013 at 17:25 UTC
89c3bbd808b352a9f4047523b81b72f22eefb868
1 file changed
+8
-4
builtin/fmt-merge-msg.c
+8
-4
@@ -503,14 +503,18 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
503
} else {
504
if (tag_number == 2) {
505
struct strbuf tagline = STRBUF_INIT;
506
- strbuf_addf(&tagline, "\n# %s\n",
507
- origins.items[first_tag].string);
506
+ strbuf_addch(&tagline, '\n');
507
+ strbuf_add_commented_lines(&tagline,
508
+ origins.items[first_tag].string,
509
+ strlen(origins.items[first_tag].string));
510
strbuf_insert(&tagbuf, 0, tagline.buf,
511
tagline.len);
512
strbuf_release(&tagline);
513
}
512
- strbuf_addf(&tagbuf, "\n# %s\n",
513
- origins.items[i].string);
514
+ strbuf_addch(&tagbuf, '\n');
515
+ strbuf_add_commented_lines(&tagbuf,
516
+ origins.items[i].string,
517
+ strlen(origins.items[i].string));
518
fmt_tag_signature(&tagbuf, &sig, buf, len);
519
}
520
strbuf_release(&sig);