Re: [PATCH] cherry-pick -x: add newline before pick note
From: Oswald Buddenhagen <hidden>
Date: 2016-06-15 22:50:44
Michael J Gruber <git <at> drmicha.warpmail.net> writes:
quoted hunk ↗ jump to hunk
Currently, cherry-pick -x sticks the pick note immediately after the existing commit message. This * is bad for commits with 1 line subject (it makes a 2 line subject) * is different from git-svn, e.g., which leaves an empty line before. Make cherry-pick always insert an empty line before the pick note. Reported-by: Martin Svensson <martin.k.svensson <at> netinsight.se> Signed-off-by: Michael J Gruber <git <at> drmicha.warpmail.net> --- builtin/revert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/builtin/revert.c b/builtin/revert.c index 57b51e4..9251257 100644 --- a/builtin/revert.c +++ b/builtin/revert.c@@ -485,7 +485,7 @@ static int do_pick_commit(void) set_author_ident_env(msg.message); add_message_to_msg(&msgbuf, msg.message); if (no_replay) { - strbuf_addstr(&msgbuf, "(cherry picked from commit "); + strbuf_addstr(&msgbuf, "\n(cherry picked from commit "); strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); strbuf_addstr(&msgbuf, ")\n"); }
so while everybody is apparently thinking about totally over-engineering things as much as possible, could we please have this patch applied so we have a solution for the time being? i really hate to tell my coworkers that they have to amend the cherry-picks just to make them comply with git's own guidelines for well-formed commit messages (and thus have them pass our pre-receive hook). regards