sequencer: remove unnecessary condition in pick_one_commit()

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index bcfbda018a7843208c7dec074215a268865ef6ff..ff28873d21c45efd46b7acd40c369b6990c4b159 100644 (file)
--- 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;