From: Junio C Hamano Date: Tue, 27 Oct 2026 20:11:40 GMT Subject: Re: [PATCH 3/3] sequencer: remove AUTO_MERGE at the end of a rebase Message-ID: In-Reply-To: <2fcb42a0858dffe45241cbced066dd0c0f5da76f.1793098652.git.phillip.wood@dunelm.org.uk> Phillip Wood writes: > From: Phillip Wood > > If there are conflicts when picking a commit, the merge machinery > creates a ref called AUTO_MERGE that the user can use to compare their > conflict resolution to the conflicted result. The sequencer tries to > remove that ref on every iteration of the loop that picks commits, > but it is only written if we stop for conflicts, so it only needs > to be removed when we enter the loop, not on every iteration. The > ref is not removed after the loop has finished, which means that if > the last pick has conflicts it is left behind after the rebase has > finished. Fix this by removing the ref before the start of the loop > in pick_commits() as the last commit did for REBASE_HEAD. The tests > modified by the last commit are extended to check AUTO_MERGE as well. Nice observation. The patch is surprisingly short and to the point. Overall looking very good. Thanks.