[PATCH] cherry-pick -x: add newline before pick note
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Nov 16, 2010, 15:11 UTC
- Message-ID
- <d0318dcd2b52f2e818888003e3dd81c7b713fec6.1289920242.git.git@drmicha.warpmail.net>
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@netinsight.se> Signed-off-by: Michael J Gruber <git@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"); }
-- 1.7.3.2.193.g78bbb