Re: [PATCH v3 2/2] Fix use of strategy options with interactive rebases

2018-07-13 Thread Elijah Newren
Hi Dscho, On Thu, Jul 12, 2018 at 8:41 AM, Johannes Schindelin wrote: > Hi Elijah, > > On Wed, 27 Jun 2018, Elijah Newren wrote: > ... >> diff --git a/git-rebase.sh b/git-rebase.sh >> index 19bdebb480..f3b10c7f62 100755 >> --- a/git-rebase.sh >> +++ b/git-rebase.sh >> @@ -328,7 +328,7 @@ do >>

Re: [PATCH v3 2/2] Fix use of strategy options with interactive rebases

2018-07-12 Thread Johannes Schindelin
Hi Elijah, On Wed, 27 Jun 2018, Elijah Newren wrote: > 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 use

[PATCH v3 2/2] Fix use of strategy options with interactive rebases

2018-06-27 Thread Elijah Newren
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 split