# [PATCH] rebase -p: fix incorrect commit message when calling `git merge`. 3 messages from 2018-02-08 to 2018-02-09. Participants: gregory.herrero@oracle.com, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/47792 ## gregory.herrero@oracle.com, 2018-02-08 20:42 Subject: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`. Message-ID: <20180208204241.19324-1-gregory.herrero@oracle.com> URL: https://gitlist.dev/e/20180208204241.19324-1-gregory.herrero%40oracle.com ``` From: Gregory Herrero 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 Suggested-by: Vegard Nossum Suggested-by: Quentin Casasnovas Signed-off-by: Gregory Herrero --- git-rebase--interactive.sh | 2 +- t/t3408-rebase-multi-line.sh | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index d47bd2959..ab6a5883e 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -396,7 +396,7 @@ pick_one_preserving_merges () { --sq-quote "$gpg_sign_opt")} \ $allow_rerere_autoupdate "$merge_args" \ "$strategy_args" \ - -m $(git rev-parse --sq-quote "$msg_content") \ + -m "$(git rev-parse --sq-quote "$msg_content")" \ "$new_parents" then printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh index 6b84e6042..e217fb4fb 100755 --- a/t/t3408-rebase-multi-line.sh +++ b/t/t3408-rebase-multi-line.sh @@ -24,8 +24,23 @@ But otherwise with a sane description." && >elif && git add elif && test_tick && - git commit -m second + git commit -m second && + git checkout -b side2 && + >afile && + git add afile && + test_tick && + git commit -m third && + echo hello > afile && + test_tick && + git commit -a -m fourth && + git checkout -b side-merge && + git reset --hard HEAD^^ && + git merge --no-ff -m "A merge commit log message that has a long +summary that spills over multiple lines. + +But otherwise with a sane description." side2 && + git branch side-merge-original ' test_expect_success rebase ' @@ -36,6 +51,15 @@ test_expect_success rebase ' git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect && test_cmp expect actual +' +test_expect_success rebasep ' + + git checkout side-merge && + git rebase -p side && + git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && + git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect && + test_cmp expect actual + ' test_done -- 2.16.1 ``` ## Junio C Hamano, 2018-02-08 22:32 Subject: Re: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`. Message-ID: URL: https://gitlist.dev/e/xmqqd11f6rk5.fsf%40gitster-ct.c.googlers.com In-Reply-To: <20180208204241.19324-1-gregory.herrero@oracle.com> ``` gregory.herrero@oracle.com writes: > 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. Thanks for a fix. Queued. ``` ## Johannes Schindelin, 2018-02-09 17:28 Subject: Re: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`. Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1802091827470.35%40ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz In-Reply-To: <20180208204241.19324-1-gregory.herrero@oracle.com> ``` Hi, On Thu, 8 Feb 2018, gregory.herrero@oracle.com wrote: > From: Gregory Herrero > > 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'. Thanks for fixing my incomplete fix. Ciao, Johannes ```