Re: [PATCH 08/11] sequencer: simplify pick_one_commit()

From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date: Jul 6, 2026, 11:06 UTC
Message-ID: <akuMQ45aQejRcQ_Y@ugly.lan>
In-Reply-To: <f51751fa3ec1545b7304b869d91d21b055218755.1782833268.git.phillip.wood@dunelm.org.uk>

On Tue, Jun 30, 2026 at 04:28:58PM +0100, Phillip Wood wrote:

Show 9 quoted lines

>+++ b/sequencer.c
>@@ -4981,14 +4983,13 @@ static int pick_one_commit(struct repository *r,
> 		}
> 		return error_with_patch(r, commit,
> 					arg, item->arg_len, opts, res, !res);
>-	}
>-	if (is_rebase_i(opts) && !res)
>+	} else if (!res) {
>

because of this ...

Show 5 quoted lines

> 		record_in_rewritten(&item->commit->object.oid,
> 				    peek_command(todo_list, 1));
>-	if (res && is_fixup(item->command)) {
>+	} else if (res && is_fixup(item->command)) {
>

.. the res conditional is pointless here.

Show 5 quoted lines

> 		return error_failed_squash(r, item->commit, opts,
> 					   item->arg_len, arg);
>-	} else if (res && is_rebase_i(opts)) {
>+	} else if (res) {
>

and here as well.

> 		int to_amend = 0;
> 		struct object_id oid;
>