Get rid of needless check of 'parents' for NULL. The NULL case
is already handled right above, and 'parents' is dereferenced
without check below anyway.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
}
/* More than one parent? */
}
/* More than one parent? */
- if (parents && parents->next) {
if (opt->ignore_merges)
return 0;
else if (opt->combine_merges)
if (opt->ignore_merges)
return 0;
else if (opt->combine_merges)