Stefan Sperling <stsp@stsp.name> wrote:
> 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.

Thanks, this all makes sense.

The regress in my patch was partly based on the histedit EDITOR=editor.sh
trick, though the "editor" was just echo 'test message' > $1.

It might take me a while to get back to this. If someone else is
keen to work on it, don't let me stop you.

-- 
James