OSDN Git Service

sequencer: remove superfluous conditional
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 22 Dec 2017 23:55:53 +0000 (00:55 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 20:33:38 +0000 (12:33 -0800)
In a conditional block that is only reached when handling a TODO_REWORD
(as seen even from a 3-line context), there is absolutely no need to
nest another block under the identical condition.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c

index 5ca9e93..e9fef58 100644 (file)
@@ -1013,9 +1013,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
                        opts);
                if (res || command != TODO_REWORD)
                        goto leave;
-               flags |= EDIT_MSG | AMEND_MSG;
-               if (command == TODO_REWORD)
-                       flags |= VERIFY_MSG;
+               flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG;
                msg_file = NULL;
                goto fast_forward_edit;
        }