From: Stefan Sperling <stsp@stsp.name>
Subject: Re: [patch, needs testing] implement fast-forward merges
To: James Cook <falsifian@falsifian.org>
Cc: gameoftrees@openbsd.org
Date: Mon, 19 Jun 2023 09:13:30 +0200

On Sat, Jun 17, 2023 at 08:37:09PM +0000, James Cook wrote:
> The below patch makes "got merge" fast-forward when possible, instead of
> aborting and advising the user to run "got integrate" instead.
> 
> I put "needs testing" in the subject line because I haven't really used
> this patch except to try out a couple of basic operations. Perhaps the
> new regression tests are enough, though.

This looks good to me, ok.

Don't worry too much about testing upfront to the point of perfection.
The tests already cover the basics and if anything turns out to be wrong
in some edge case we can fix the problem and improve test coverage. Even
if some issue ends up in a released version we can always make another
release to ship fixes.

> A possible follow-up change would be an -M option to force creating a
> merge commit.

Yes, having that available would be nice.