Re: [PATCH 2/3] rebase --apply: restore some tests

[Phillip Wood <phillip.wood123@gmail.com>]

On 10/08/2021 17:58, Elijah Newren wrote:
> On Tue, Aug 10, 2021 at 2:32 AM Phillip Wood via GitGitGadget
>>   test_expect_success 'rebase --skip can not be used with other options' '
>> diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
>> index f4c2ee02bc9..e4cb8be0418 100755
>> --- a/t/t3418-rebase-continue.sh
>> +++ b/t/t3418-rebase-continue.sh
>> @@ -36,7 +36,7 @@ test_expect_success 'non-interactive rebase --continue works with touched file'
>>          git reset --hard &&
>>          git checkout main &&
>>
>> -       test_must_fail git rebase --onto main main topic &&
>> +       test_must_fail git rebase --apply --onto main main topic &&
> 
> I think the point here is that you're noticing that "git rebase -i"
> and "git rebase" are both built on the same rebase backend (the merge
> one) and thus that testing interactive vs. non-interactive isn't much
> of a test.

Exactly

>  The real test we are interested in is merge-backend vs.
> apply-backend.  Your code change here is the necessary one to do that,
> but it least the test descriptions still talking about interactive vs.
> non-interactive even though that's not what we're concentrating on
> anymore.
> 
> I'd say we'd at least want to change the description for this test,
> "non-interactive rebase ---continue works with..." => "rebase
> --continue with the apply backend works with...", but that we'd
> probably want to change the description of the test before it and
> maybe even just use rebase --merge rather than rebase -i.

Rewording the test descriptions is a good suggestion

Thanks

Phillip

> 
>>          echo "Resolved" >F2 &&
>>          git add F2 &&
>>          test-tool chmtime =-60 F1 &&
>> @@ -254,7 +254,7 @@ test_rerere_autoupdate () {
>>          '
>>   }
>>
>> -test_rerere_autoupdate
>> +test_rerere_autoupdate --apply
> 
> Looks good.
> 
>>   test_rerere_autoupdate -m
>>   GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
>>   test_rerere_autoupdate -i
>> --
>> gitgitgadget