diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 16:26:08 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-09 14:57:29 -0800 |
| commit | 637666c82258a2a11424791ad83b3a43cae101a4 (patch) | |
| tree | f0b5bce3026634e5a16f6c8a16d3dbc8a956e8b3 /sequencer.c | |
| parent | Fourth batch for 2.12 (diff) | |
| download | tgif-637666c82258a2a11424791ad83b3a43cae101a4.tar.xz | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 1 insertions, 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; |