Re: [PATCH] cherry-pick -x: always insert an empty line
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:06
Beat Bolli [off-list ref] writes:
quoted hunk
When cherry-picking a commit that has only a summary, the -x option creates an invalid commit message because it puts the hash of the commit being picked on the second line which should be left empty. This patch fixes this buglet by always inserting an empty line before the added line. Aside from that, even with a non-trivial commit the generated note "(cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)" seems abrupt when appended directly. Cc: Eric Raible <redacted> Signed-off-by: Beat Bolli <redacted> --- sequencer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/sequencer.c b/sequencer.c index 5fcbcb8..63fd589 100644 --- a/sequencer.c +++ b/sequencer.c@@ -382,7 +382,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) } if (opts->record_origin) { - strbuf_addstr(&msgbuf, "(cherry picked from commit "); + strbuf_addstr(&msgbuf, "\n(cherry picked from commit ");
Doesn't this need to be conditional?
If we cherry pick your commit somewhere else with "-x -s", the resulting
commit log message would end like this:
Aside from that, even with a non-trivial commit the generated note
"(cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)"
seems abrupt when appended directly.
Cc: Eric Raible [off-list ref]
Signed-off-by: Beat Bolli [off-list ref]
(cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)
Signed-off-by: Frotz Xyzzy [off-list ref]
which clearly is worse-looking with the extra LF you added in this patch.
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); strbuf_addstr(&msgbuf, ")\n"); }