diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-27 08:48:04 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-27 12:25:12 -0700 |
| commit | 0060041df1b0873b36aacfae8e579999bcc27f39 (patch) | |
| tree | a17188b62c451d4311b5a71f2886e8169d715dc1 | |
| parent | t3418: add testcase showing problems with rebase -i and strategy options (diff) | |
| download | tgif-0060041df1b0873b36aacfae8e579999bcc27f39.tar.xz | |
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>
| -rwxr-xr-x | git-rebase.sh | 2 | ||||
| -rw-r--r-- | sequencer.c | 7 | ||||
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 2 |
3 files changed, 8 insertions, 3 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 ;; diff --git a/sequencer.c b/sequencer.c index f9d1001dee..96f9630856 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2000,6 +2000,7 @@ static int populate_opts_cb(const char *key, const char *value, void *data) static void read_strategy_opts(struct replay_opts *opts, struct strbuf *buf) { int i; + char *strategy_opts_string; strbuf_reset(buf); if (!read_oneliner(buf, rebase_path_strategy(), 0)) @@ -2008,7 +2009,11 @@ static void read_strategy_opts(struct replay_opts *opts, struct strbuf *buf) if (!read_oneliner(buf, rebase_path_strategy_opts(), 0)) return; - opts->xopts_nr = split_cmdline(buf->buf, (const char ***)&opts->xopts); + strategy_opts_string = buf->buf; + if (*strategy_opts_string == ' ') + strategy_opts_string++; + opts->xopts_nr = split_cmdline(strategy_opts_string, + (const char ***)&opts->xopts); for (i = 0; i < opts->xopts_nr; i++) { const char *arg = opts->xopts[i]; diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index c2de13ea21..5717c80120 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -74,7 +74,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' test -f funny.was.run ' -test_expect_failure 'rebase -i --continue handles merge strategy and options' ' +test_expect_success 'rebase -i --continue handles merge strategy and options' ' rm -fr .git/rebase-* && git reset --hard commit-new-file-F2-on-topic-branch && test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 && |