[PATCH 09/11] sequencer: return early from pick_one_commit() on success
From: Phillip Wood <hidden>
Date: 2026-06-30 15:29:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Phillip Wood <redacted> The only block that does not return early is the one guarded by "!res". Move the return into that block to make it clear that after recording the commit as rewritten all we do is return from the function. Signed-off-by: Phillip Wood <redacted> --- sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 416729f30a7..655a2e84bef 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -4986,6 +4986,7 @@ static int pick_one_commit(struct repository *r, } else if (!res) { record_in_rewritten(&item->commit->object.oid, peek_command(todo_list, 1)); + return 0; } else if (res && is_fixup(item->command)) { return error_failed_squash(r, item->commit, opts, item->arg_len, arg);
@@ -5009,7 +5010,8 @@ static int pick_one_commit(struct repository *r, return error_with_patch(r, item->commit, arg, item->arg_len, opts, res, to_amend); } - return res; + + BUG("Unhandled return value from do_pick_commit()"); } static int pick_commits(struct repository *r,
--
2.54.0.200.gfd8d68259e3