[PATCH] notes: avoid empty line in template
- From
Michael J Gruber <git@grubix.eu>
- Date
- Nov 16, 2022, 15:56 UTC
- Message-ID
- <347ee7ad6fea7cf96bb1e51772802102082b58cc.1668614158.git.git@grubix.eu>
When `git notes` prepares the template it adds an empty newline between the comment header and the content:
Show 6 quoted lines
> > # > # Write/edit the notes for the following object: > > # commit 0f3c55d4c2b7864bffb2d92278eff08d0b2e083f > # etc
This is wrong structurally because that newline is part of the comment, too, and thus should be commented. Also, it throws off some positioning strategies of editors and plugins, and it differs from how we do commit templates.
Change this to follow the standard set by `git commit`:
Show 6 quoted lines
> > # > # Write/edit the notes for the following object: > # > # commit 0f3c55d4c2b7864bffb2d92278eff08d0b2e083f >
Tests pass unchanged after this code change.
Signed-off-by: Michael J Gruber <git@grubix.eu> --- builtin/notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/notes.c b/builtin/notes.c index be51f69225..80d9dfd25c 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -181,7 +181,7 @@ static void prepare_note_data(const struct object_id *object, struct note_data * strbuf_addch(&buf, '\n'); strbuf_add_commented_lines(&buf, "\n", strlen("\n")); strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template))); - strbuf_addch(&buf, '\n'); + strbuf_add_commented_lines(&buf, "\n", strlen("\n")); write_or_die(fd, buf.buf, buf.len); write_commented_object(fd, object);
-- 2.38.1.672.gc8cd8f59d3