On Fri, Apr 20, 2018 at 3:29 PM, Eric Sunshine <[email protected]> wrote:
> On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
> <[email protected]> wrote:
>> + test_must_fail env FAKE_LINES="1 fixup 2 fixup 4" \
>> + git rebase -i HEAD~4 &&
>> +
>> + : now there is a conflict, and comments in the commit message &&
>> + git show HEAD >out &&
>> + grep "This is a combination of" out &&
>> +
>> + : skip and continue &&
>> + git rebase --skip &&
>
> I see that this test script doesn't utilize it, but do you want a
>
> test_when_finished "reset_rebase" &&
>
> before starting the rebase to clean up in case something before "git
> rebase --skip" fails?
Stated less ambiguously:
... in case something fails between "git rebase -i ..."
and "git rebase --skip"?
