git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/5] sequencer: remove superfluous conditional

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 22, 2017, 23:55 UTC
Message-ID
<2e30f42e0bbe6d1f86f46e6461d3218adb2ede5b.1513986836.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1513986836.git.johannes.schindelin@gmx.de>

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>
---
 sequencer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 8e6b6289be6..38266c3c228 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1011,9 +1011,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;
 	}
-- 
2.15.1.windows.2
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 8 in “A couple of sequencer cleanups”
  1. 0/5 A couple of sequencer cleanupsJohannes Schindelin, Dec 22, 2017
  2. 1/5 rebase: do not continue when the todo list generation failedJohannes Schindelin, Dec 22, 2017
  3. 2/5 sequencer: strip bogus LF at end of error messagesJohannes Schindelin, Dec 22, 2017
  4. 3/5 sequencer: remove superfluous conditionalJohannes Schindelin, Dec 22, 2017
  5. 4/5 sequencer: report when noop has an argumentJohannes Schindelin, Dec 22, 2017
  6. 5/5 sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin, Dec 22, 2017
  7. Liam BeguinDec 27, 2017
  8. Junio C HamanoDec 27, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.