Re: [PATCH v3 1/2] t3418: add testcase showing problems with rebase -i and strategy options

2018-07-11 Thread Elijah Newren
HI SZEDER, On Wed, Jul 11, 2018 at 3:56 AM, SZEDER Gábor wrote: > On Wed, Jun 27, 2018 at 8:28 PM SZEDER Gábor wrote: >> >> > diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh >> > index 03bf1b8a3b..11546d6e14 100755 >> > --- a/t/t3418-rebase-continue.sh >> > +++ b/t/t3418-reb

Re: [PATCH v3 1/2] t3418: add testcase showing problems with rebase -i and strategy options

2018-07-11 Thread SZEDER Gábor
On Wed, Jun 27, 2018 at 8:28 PM SZEDER Gábor wrote: > > > diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh > > index 03bf1b8a3b..11546d6e14 100755 > > --- a/t/t3418-rebase-continue.sh > > +++ b/t/t3418-rebase-continue.sh > > @@ -74,6 +74,38 @@ test_expect_success 'rebase --cont

Re: [PATCH v3 1/2] t3418: add testcase showing problems with rebase -i and strategy options

2018-06-27 Thread SZEDER Gábor
> diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh > index 03bf1b8a3b..11546d6e14 100755 > --- a/t/t3418-rebase-continue.sh > +++ b/t/t3418-rebase-continue.sh > @@ -74,6 +74,38 @@ test_expect_success 'rebase --continue remembers merge > strategy and options' ' > test -f f

[PATCH v3 1/2] t3418: add testcase showing problems with rebase -i and strategy options

2018-06-27 Thread Elijah Newren
We are not passing the same args to merge strategies when we are doing an --interactive rebase as we do with a --merge rebase. The merge strategy should not need to be aware of which type of rebase is in effect. Add a testcase which checks for the appropriate args. Signed-off-by: Elijah Newren