"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Mark Jamsek <mark@jamsek.com>
Subject:
Re: [PATCH] got histedit: make mesg behave like pick
To:
Stefan Sperling <stsp@stsp.name>
Cc:
gameoftrees@openbsd.org
Date:
Wed, 25 Oct 2023 15:07:07 +1100

Download raw body.

Thread
Stefan Sperling <stsp@stsp.name> wrote:
> On Tue, Oct 24, 2023 at 07:29:46PM +0200, Lorenz (xha) wrote:
> > On Wed, Oct 25, 2023 at 02:36:37AM +1100, Mark Jamsek wrote:
> > > Regarding the bug, we need to save the 'mesg' instruction as a 'pick' so
> > > it's not reprocessed again after 'got he -c', but also launch the editor
> > > to write the new message. The below diff applies on top of Lorenz's to
> > > make this change, which should fix this bug and keep regress happy:
> > 
> > i think i found a better solution to this problem, which is to just
> > apply this in the main loop where we iterate over all histedit entries.
> > this way we don't apply it twice since we save the commits that we've
> > already done in resume_commit_id. regress is still happy and everything
> > works as expected for me :-)
> 
> Seems fine to me. Nice simplification overall.
> 
> Mark, do you agreee with this new version of the diff?

Yes, this is a nice simplification; ok for me

Good work, Lorenz, it's much better!


-- 
Mark Jamsek <https://bsdbox.org>
GPG: F2FF 13DE 6A06 C471 CA80  E6E2 2930 DC66 86EE CF68