diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-12-23 00:55:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 12:33:38 -0800 |
| commit | 5f8f927710a039ce3068ac55ca87354477a199b9 (patch) | |
| tree | 544f773be3467aa4c41217b62a27a2be843bdc38 | |
| parent | sequencer: strip bogus LF at end of error messages (diff) | |
| download | tgif-5f8f927710a039ce3068ac55ca87354477a199b9.tar.xz | |
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>
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index 5ca9e93888..e9fef58ba0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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; } |