Re: [PATCH] t3419: prevent failure when run with EXPENSIVE

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 20, 2020, 22:24 UTC
Message-ID: <xmqqeetmbr6z.fsf@gitster.c.googlers.com>
In-Reply-To: <CABPp-BGiP7eG7Ojt8FKV5PUBFk74pkO6jnOwJEZbDzBjdJUm5w@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 9 quoted lines

>> -               rm -rf .git/rebase-apply
>> +               rm -rf .git/rebase-merge .git/rebase-apply
>>         '
>>  }
>
> Good catch, thanks.  Perhaps we just want to invoke 'git rebase
> --quit' and let it clean up instead of manually doing so ourselves,
> since it may buy us some future-proofing in case we ever want to move
> the place we store rebase state?

I started writing "I would agree 100% if this script were not about testing 'rebase', but using 'rebase' itself for a framework to test 'rebase'???" but then if 'rebase --quit' fails to clear these, what we are likely to see is that the next test to fail, so it probably is an OK approach.

Thanks.