The interactive machinery for git rebase can accept special merge
strategies or strategy options, but has a bug in its handling of
strategy options. This short series patches that.
Changes since v1:
- Small change to the second commit message
- Addition of a cover letter. :-)
Elijah Newren (2):
t3418: add testcase showing problems with rebase -i and strategy
options
Fix use of strategy options with interactive rebases
git-rebase.sh | 2 +-
sequencer.c | 7 ++++++-
t/t3418-rebase-continue.sh | 32 ++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+), 2 deletions(-)
1: 68cad084cf = 1: 43b9ac5a63 t3418: add testcase showing problems with
rebase -i and strategy options
2: 8eda0e7c1e ! 2: d345eb96d5 Fix use of strategy options with interactive
rebases
@@ -2,9 +2,10 @@
Fix use of strategy options with interactive rebases
- git-rebase.sh wrote stuff like
+ git-rebase.sh wrote strategy options to .git/rebase/merge/strategy_opts
+ in the following format:
'--ours' '--renormalize'
- to .git/rebase-merge/strategy_opts. Note the double spaces.
+ 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.
@@ -15,10 +16,11 @@
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
+ instead of the expected/desired
git merge-$strategy --ours --renormalize $merge_base -- $head $remote
- Remove the extra spaces so that split_cmdline() will work as expected.
+ 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 <[email protected]>
--
2.18.0.9.g431b2c36d5
