[PATCH v3 01/38] sequencer: avoid unnecessary curly braces
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 2, 2017, 15:26 UTC
- Message-ID
- <bc1a6c21c9ab2f55882c363e802bfcf37e49d79f.1483370556.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1483370556.git.johannes.schindelin@gmx.de>
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 <johannes.schindelin@gmx.de> --- 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