[PATCH v2 07/10] sequencer: remove unnecessary condition in pick_one_commit()
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Jul 13, 2026, 13:17 UTC
- Message-ID
- <71ed717d3224dbd143fe0cce8adfac65b7ea4ed6.1783948637.git.phillip.wood@dunelm.org.uk>
- In-Reply-To
- <cover.1783948637.git.phillip.wood@dunelm.org.uk>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
item->commit holds the commit to be picked and so it must be non-NULL otherwise pick_one_commit() would not know which commit to pick. It is also unconditionally dereferenced in do_pick_commit() which is called at the top of this function. Therefore the check to see if it is non-NULL is superfluous.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c index a70889a107e..5f5ff3783e6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4988,7 +4988,7 @@ static int pick_one_commit(struct repository *r, if (res && is_fixup(item->command)) { return error_failed_squash(r, item->commit, opts, item->arg_len, arg); - } else if (res && is_rebase_i(opts) && item->commit) { + } else if (res && is_rebase_i(opts)) { int to_amend = 0; struct object_id oid;
-- 2.54.0.200.gfd8d68259e3