summaryrefslogtreecommitdiff
path: root/builtin/rebase--helper.c
diff options
context:
space:
mode:
authorLibravatar Gregory Herrero <gregory.herrero@oracle.com>2018-02-08 21:42:41 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-08 14:31:57 -0800
commited5144d7eb63a0e0e71d3b281e69e953abbf0365 (patch)
tree1e0a2a0ea47dd4183d824fb3dd8316e7d3f2b522 /builtin/rebase--helper.c
parentrebase -p: fix quoting when calling `git merge` (diff)
downloadtgif-ed5144d7eb63a0e0e71d3b281e69e953abbf0365.tar.xz
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>
Diffstat (limited to 'builtin/rebase--helper.c')
0 files changed, 0 insertions, 0 deletions