kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ralf Thielow 2013-04-07 17:25:44 +02:00 committed by Junio C Hamano
parent 9927ebed19
commit 89c3bbd808
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/fmt-merge-msg.c
View File

@ -503,14 +503,18 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
} else { } else {
if (tag_number == 2) { if (tag_number == 2) {
struct strbuf tagline = STRBUF_INIT; struct strbuf tagline = STRBUF_INIT;
strbuf_addf(&tagline, "\n# %s\n", strbuf_addch(&tagline, '\n');
origins.items[first_tag].string); strbuf_add_commented_lines(&tagline,
origins.items[first_tag].string,
strlen(origins.items[first_tag].string));
strbuf_insert(&tagbuf, 0, tagline.buf, strbuf_insert(&tagbuf, 0, tagline.buf,
tagline.len); tagline.len);
strbuf_release(&tagline); strbuf_release(&tagline);
} }
strbuf_addf(&tagbuf, "\n# %s\n", strbuf_addch(&tagbuf, '\n');
origins.items[i].string); strbuf_add_commented_lines(&tagbuf,
origins.items[i].string,
strlen(origins.items[i].string));
fmt_tag_signature(&tagbuf, &sig, buf, len); fmt_tag_signature(&tagbuf, &sig, buf, len);
} }
strbuf_release(&sig); strbuf_release(&sig);