From: Stefan Sperling <stsp@stsp.name>
Subject: Re: (test&doc only) RFC: allow editing merge commit messages
To: Omar Polo <op@omarpolo.com>
Cc: James Cook <falsifian@falsifian.org>, gameoftrees@openbsd.org
Date: Sun, 8 Nov 2026 13:57:39 +0100

On Sun, Nov 08, 2026 at 12:55:15PM +0100, Omar Polo wrote:
> Stefan Sperling <stsp@stsp.name> wrote:
> > storing the log message was modified before proceeding. In case of
> > 'got merge' it would need to proceed anyway, even if the auto-generated
> > log message was not modified by the editor. However, perhaps empty log
> > messages should be caught and rejected with a retry-loop, just in case.
> 
> let's avoid an automatic retry-loop, or you won't be able to escape
> without committing the merge.  `got mg -c' could then be used eventually
> to resurrect.

Leaving the merge in interrupted state if the commit message is
empty would work for me as well. The goal is just to avoid commits
with empty log messages from entering the repository, from where
they could potentially be sent to other repositories and become
difficult to get rid of.