[PATCH v3 01/38] sequencer: avoid unnecessary curly braces
From: Johannes Schindelin <hidden>
Date: 2017-01-02 15:26:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
This was noticed while addressing Junio Hamano's concern that some "else" operators were on separate lines than the preceding closing brace. Signed-off-by: Johannes Schindelin <redacted> --- sequencer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 9adb7bbf1d..23793db08b 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -632,9 +632,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, } discard_cache(); - if (!commit->parents) { + if (!commit->parents) parent = NULL; - } else if (commit->parents->next) { /* Reverting or cherry-picking a merge commit */ int cnt;
--
2.11.0.rc3.windows.1