Re: [PATCH v4 3/3] sequencer: disable auto maintenance in spawned commands

From: Thomas Bachem <mail@thomasbachem.com>
Date: Sep 14, 2026, 07:11 UTC
Message-ID: <CAA0xjtr6FjdsfhfDbBW6OaxUqKpUo0prWE_SrLD_-0UBGfDAGQ@mail.gmail.com>
In-Reply-To: <cd3d98ef-ad80-405d-98b8-fc40e7c5ec9b@gmail.com>

Hi Phillip,

On 09/09/2026 16:40, Phillip Wood wrote:

Show 6 quoted lines

> This is much more concise, but still sounds a bit strange to me. I'd suggest
>
> When the sequencer spawns "git commit", or "git merge", those commands
> run "git maintenance --auto" in the background which can interfere with
> the sequencer (e.g. 'rerere gc' holding MERGE_RR.lock or repacks
> deleting active packs).

I'll take that.

> What's this trying to check - there wasn't a conflict so
> commit_staged_changes() will error out without trying to commit
> anything.

There is one. In this script topic and main both add F2, so the pick conflicts and the rebase stops before it gets to the exec. The "--continue" then spawns "git commit" for the resolution, which is what I look for in mid.txt, and only then runs the exec, which fails and stops the rebase a second time. Without that line the check for no maintenance run right below it would also pass if nothing had been spawned at all. I'll add a comment to the test.

Thanks, Thomas