From 185c214c0740f40a0ef8ec91bc42174491abcd45 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 19 Dec 2016 14:50:30 +0100 Subject: [PATCH] sequencer: avoid unnecessary curly braces 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 --- sequencer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 0b78f3149f..b2a65547d8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -679,9 +679,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;