From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 22 Dec 2017 23:55:53 +0000 (+0100)
Subject: sequencer: remove superfluous conditional
X-Git-Tag: v2.16.0-rc1~1^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5f8f927710a039ce3068ac55ca87354477a199b9

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>
---

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;
 	}