* [PATCH] rebase -p: fix incorrect commit message when calling `git merge`.
@ 2018-02-08 20:42 gregory.herrero
2018-02-08 22:32 ` Junio C Hamano
2018-02-09 17:28 ` Johannes Schindelin
0 siblings, 2 replies; 3+ messages in thread
From: gregory.herrero @ 2018-02-08 20:42 UTC (permalink / raw)
To: git; +Cc: Gregory Herrero
From: Gregory Herrero <gregory.herrero@oracle.com>
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`.
2018-02-08 20:42 [PATCH] rebase -p: fix incorrect commit message when calling `git merge` gregory.herrero
@ 2018-02-08 22:32 ` Junio C Hamano
2018-02-09 17:28 ` Johannes Schindelin
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2018-02-08 22:32 UTC (permalink / raw)
To: gregory.herrero; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`.
2018-02-08 20:42 [PATCH] rebase -p: fix incorrect commit message when calling `git merge` gregory.herrero
2018-02-08 22:32 ` Junio C Hamano
@ 2018-02-09 17:28 ` Johannes Schindelin
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Schindelin @ 2018-02-09 17:28 UTC (permalink / raw)
To: Gregory Herrero; +Cc: git
Hi,
On Thu, 8 Feb 2018, gregory.herrero@oracle.com wrote:
> From: Gregory Herrero <gregory.herrero@oracle.com>
>
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-09 17:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-08 20:42 [PATCH] rebase -p: fix incorrect commit message when calling `git merge` gregory.herrero
2018-02-08 22:32 ` Junio C Hamano
2018-02-09 17:28 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).