Re: [PATCH 1/3] rebase -i: demonstrate bug with fixup!/squash! commit messages

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Apr 20, 2018, 19:31 UTC
Message-ID: <CAPig+cRO2+NJ0-DiuHXA=mWjPnivqH3PiwM9R6OGj2Rr3eLauA@mail.gmail.com>
In-Reply-To: <CAPig+cSb33EG2nATjCem4-2dp87SKOXm_SCWU=fCXJCBRZzgeg@mail.gmail.com>

On Fri, Apr 20, 2018 at 3:29 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:

Show 18 quoted lines

> On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
> <johannes.schindelin@gmx.de> 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"?