diff options
author | Elijah Newren <newren@gmail.com> | 2018-06-27 18:48:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-27 22:25:12 +0300 |
commit | 0060041df1b0873b36aacfae8e579999bcc27f39 (patch) | |
tree | a17188b62c451d4311b5a71f2886e8169d715dc1 /git-rebase.sh | |
parent | a5a959d9a8481f46f89be437d7b336c70b473d9b (diff) |
Fix use of strategy options with interactive rebases
git-rebase.sh wrote strategy options to .git/rebase/merge/strategy_opts
in the following format:
'--ours' '--renormalize'
Note the double spaces.
git-rebase--interactive uses sequencer.c to parse that file, and
sequencer.c used split_cmdline() to get the individual strategy options.
After splitting, sequencer.c prefixed each "option" with a double dash,
so, concatenating all its options would result in:
-- --ours -- --renormalize
So, when it ended up calling try_merge_strategy(), that in turn would run
git merge-$strategy -- --ours -- --renormalize $merge_base -- $head $remote
instead of the expected/desired
git merge-$strategy --ours --renormalize $merge_base -- $head $remote
Remove the extra spaces so that when it goes through split_cmdline() we end
up with the desired command line.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index a1f6e5de6a..555f307d4f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -289,7 +289,7 @@ do do_merge=t ;; --strategy-option=*) - strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}")" + strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)" do_merge=t test -z "$strategy" && strategy=recursive ;; |