Re: [PATCH] sequencer: update abort safety file more sparingly

From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date: Sep 3, 2023, 19:25 UTC
Message-ID: <ZPTdmnHfDcTBqaSl@ugly>
In-Reply-To: <29fb7a38-1e92-457a-93ff-0e64ac09b907@gmail.com>

On Sun, Sep 03, 2023 at 07:40:00PM +0100, Phillip Wood wrote:

Show 6 quoted lines

>On 03/09/2023 16:11, Oswald Buddenhagen wrote:
>> The only situation where the file's content matters is --continue'ing
>> (after a multi-cherry-pick merge conflict).
>
>I don't think "cherry-pick --continue" consults the abort safety file, 
>

duh, obvious blunder.

>it only matters for "cherry-pick --skip"
>

that doesn't seem right. a --skip is just a --continue with a prior reset, more or less.

>and "cherry-pick --abort".
>

that one, of course.

Show 8 quoted lines

>> This means that it is
>> sufficient to write it in a single place, when we are prematurely
>> exiting the main workhorse.
>
>I think this introduces a regression because the safety file will not 
>get updated when "cherry-pick --continue" stops for the user to resolve 
>conflicts.
>

true, there is indeed this second entry point. i'll try to find a better "choke point".

Show 8 quoted lines

>> which wasn't even reliable: a single pick executed during an 
>> interrupted sequence would bypass the safety.
>
>An alternate view is that the abort safety file exists to prevent the 
>user losing commits that have not been cherry-picked and it is 
>desirable to be able to abort after cherry-picking a single pick in the 
>middle of a sequence of cherry-picks.
>

if you did a fresh commit before or after the single pick, you'd lose it. also, the feature doesn't actually prevent aborting, only the automatic reset.

regards