зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
e05806da9e
Коммит
637666c822
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче