mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
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>
This commit is contained in:
parent
dd6fb0053c
commit
ed5144d7eb
|
@ -396,7 +396,7 @@ pick_one_preserving_merges () {
|
||||||
--sq-quote "$gpg_sign_opt")} \
|
--sq-quote "$gpg_sign_opt")} \
|
||||||
$allow_rerere_autoupdate "$merge_args" \
|
$allow_rerere_autoupdate "$merge_args" \
|
||||||
"$strategy_args" \
|
"$strategy_args" \
|
||||||
-m $(git rev-parse --sq-quote "$msg_content") \
|
-m "$(git rev-parse --sq-quote "$msg_content")" \
|
||||||
"$new_parents"
|
"$new_parents"
|
||||||
then
|
then
|
||||||
printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
|
printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
|
||||||
|
|
|
@ -24,8 +24,23 @@ But otherwise with a sane description." &&
|
||||||
>elif &&
|
>elif &&
|
||||||
git add elif &&
|
git add elif &&
|
||||||
test_tick &&
|
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 '
|
test_expect_success rebase '
|
||||||
|
@ -36,6 +51,15 @@ test_expect_success rebase '
|
||||||
git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
|
git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
|
||||||
test_cmp expect actual
|
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
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue