rebase -p: fix incorrect commit message when calling `git merge`.
authorGregory Herrero <gregory.herrero@oracle.com>
Thu, 8 Feb 2018 20:42:41 +0000 (21:42 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 22:31:57 +0000 (14:31 -0800)
commited5144d7eb63a0e0e71d3b281e69e953abbf0365
tree1e0a2a0ea47dd4183d824fb3dd8316e7d3f2b522
parentdd6fb0053ce5b6923505e64993d8061484665962
rebase -p: fix incorrect commit message when calling `git merge`.

Since commit dd6fb0053 ("rebase -p: fix quoting when calling `git
merge`"), commit message of the merge commit being rebased is passed to
the merge command using a subshell executing 'git rev-parse --sq-quote'.

Double quotes are needed around this subshell so that, newlines are
kept for the git merge command.

Before this patch, following merge message:

    "Merge mybranch into mynewbranch

    Awesome commit."

becomes:

    "Merge mybranch into mynewbranch Awesome commit."

after a rebase -p.

Fixes: "dd6fb0053 rebase -p: fix quoting when calling `git merge`"
Reported-by: Jamie Iles <jamie.iles@oracle.com>
Suggested-by: Vegard Nossum <vegard.nossum@oracle.com>
Suggested-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Gregory Herrero <gregory.herrero@oracle.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
t/t3408-rebase-multi-line.sh