mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
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>
This commit is contained in:
parent
9927ebed19
commit
89c3bbd808
1 changed files with 8 additions and 4 deletions
|
@ -503,14 +503,18 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
|
|||
} else {
|
||||
if (tag_number == 2) {
|
||||
struct strbuf tagline = STRBUF_INIT;
|
||||
strbuf_addf(&tagline, "\n# %s\n",
|
||||
origins.items[first_tag].string);
|
||||
strbuf_addch(&tagline, '\n');
|
||||
strbuf_add_commented_lines(&tagline,
|
||||
origins.items[first_tag].string,
|
||||
strlen(origins.items[first_tag].string));
|
||||
strbuf_insert(&tagbuf, 0, tagline.buf,
|
||||
tagline.len);
|
||||
strbuf_release(&tagline);
|
||||
}
|
||||
strbuf_addf(&tagbuf, "\n# %s\n",
|
||||
origins.items[i].string);
|
||||
strbuf_addch(&tagbuf, '\n');
|
||||
strbuf_add_commented_lines(&tagbuf,
|
||||
origins.items[i].string,
|
||||
strlen(origins.items[i].string));
|
||||
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
||||
}
|
||||
strbuf_release(&sig);
|
||||
|
|
Loading…
Reference in a new issue