From: Johannes Schindelin Date: Mon, 2 Jan 2017 15:26:08 +0000 (+0100) Subject: sequencer: avoid unnecessary curly braces X-Git-Tag: v2.12.0-rc0~38^2~37 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/637666c82258a2a11424791ad83b3a43cae101a4 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 Signed-off-by: Junio C Hamano --- 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;