Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
> git-rebase--interactive.sh | 9 ++++++---
> t/t3418-rebase-continue.sh | 14 ++++++++++++++
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index e3f5a0abf3c..085aa068cbb 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -392,9 +392,12 @@ pick_one_preserving_merges () {
> new_parents=${new_parents# $first_parent}
> merge_args="--no-log --no-ff"
> if ! do_with_author output eval \
> - 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \
> - $allow_rerere_autoupdate $merge_args \
> - $strategy_args -m "$msg_content" $new_parents'
> + git merge ${gpg_sign_opt:+$(git rev-parse \
> + --sq-quote "$gpg_sign_opt")} \
> + $allow_rerere_autoupdate "$merge_args" \
> + "$strategy_args" \
> + -m $(git rev-parse --sq-quote "$msg_content") \
> + "$new_parents"
Makes sense. I should have been more careful when reviewing
db2b3b820e2.
Thanks.
