From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] sequencer: update abort safety file more sparingly
Date: Sun, 3 Sep 2023 22:18:24 +0200 [thread overview]
Message-ID: <ZPTqEIvW3zJ4eafT@ugly> (raw)
In-Reply-To: <fdf80c36-0e28-44f3-9cef-85d38d2d48f1@gmail.com>
On Sun, Sep 03, 2023 at 08:48:14PM +0100, Phillip Wood wrote:
>On 03/09/2023 20:25, Oswald Buddenhagen wrote:
>> On Sun, Sep 03, 2023 at 07:40:00PM +0100, Phillip Wood wrote:
>>> 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.
>
>sequencer_skip() calls rollback_is_safe() which checks the abort safety
>file.
>
that's weird. can you think of a good reason for doing that?
>> i'll try to find a better "choke point".
>
>I think that is probably tricky,
>
yeah
>I'm not really clear what the aim/purpose of this refactoring is.
>
to make my head not explode.
more specifically, to get it out of the way of the rebase path, which is
what i'm actually concerned with.
generally, i think this whole ad-hoc state management is a nightmare,
and i'd be surprised if there weren't some more loose ends.
i think i'd aim for an object-oriented-ish design with an encapsulated
state, lazy loading getters, lazy setters, and a commit entry point (or
maybe several partial ones). no idea how that would play out.
>> if you did a fresh commit before or after the single pick, you'd lose
>> it.
>
>Oh, I can see that you'd lose a commit made before a single pick but I
>don't see how you'd lose a commit made after it.
>
right. thinko. it's a bit late here. ^^
regards
next prev parent reply other threads:[~2023-09-03 20:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-03 15:11 [PATCH] sequencer: update abort safety file more sparingly Oswald Buddenhagen
2023-09-03 18:40 ` Phillip Wood
2023-09-03 19:25 ` Oswald Buddenhagen
2023-09-03 19:48 ` Phillip Wood
2023-09-03 20:18 ` Oswald Buddenhagen [this message]
2023-09-04 10:05 ` Phillip Wood
2023-09-04 12:48 ` Oswald Buddenhagen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZPTqEIvW3zJ4eafT@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
--cc=s-beyer@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox