sequencer: remove superfluous conditional
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>
This commit is contained in:
parent
aee42e1f35
commit
5f8f927710
@ -1013,9 +1013,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||||||
opts);
|
opts);
|
||||||
if (res || command != TODO_REWORD)
|
if (res || command != TODO_REWORD)
|
||||||
goto leave;
|
goto leave;
|
||||||
flags |= EDIT_MSG | AMEND_MSG;
|
flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG;
|
||||||
if (command == TODO_REWORD)
|
|
||||||
flags |= VERIFY_MSG;
|
|
||||||
msg_file = NULL;
|
msg_file = NULL;
|
||||||
goto fast_forward_edit;
|
goto fast_forward_edit;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user