From: Charvi Mendiratta <charvi077@gmail.com>
Date: Thu, 04 Feb 2021 19:12:42 GMT
Subject: Re: [PATCH v4 7/9] t3437: test script for fixup [-C|-c] options in interactive rebase
Message-ID: <CAPSFM5eYMRuWoYaVFn9+5kZ16DoaLZ_8Pqu5hScbu9H0twXXiQ@mail.gmail.com>
In-Reply-To: <CAPig+cQO_uHurPn3N-k-UwBFgvx2x8Bx2Uy+=sQxhmj3E6rt7Q@mail.gmail.com>

Hi Eric,

> > +test_expect_success 'fixup -C with conflicts gives correct message' '
> > +       test_when_finished "test_might_fail git rebase --abort" &&
>
> Is there a reason this isn't written as:
>
>     test_when_finished "reset_rebase" &&
>
> which is more common? Is there something non-obvious which makes
> reset_rebase() inappropriate in these tests?
>

I missed this earlier, but I confirmed before sending next version that as
reset_rebase() removes the untracked files so we could not use this as otherwise
it removes the fake-editor.sh file and will be required to set a fake
editor for every
test and also removes other untracked files which may be used to debug.
So, I think it's okay with:
test_when_finished "test_might_fail git rebase --abort"

Thanks and regards,
Charvi