Browse Source

log_tree_diff: get rid of extra check for NULL

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>
maint
Sergey Organov 5 years ago committed by Junio C Hamano
parent
commit
793d37c17f
  1. 2
      log-tree.c

2
log-tree.c

@ -917,7 +917,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log @@ -917,7 +917,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
}

/* More than one parent? */
if (parents && parents->next) {
if (parents->next) {
if (opt->ignore_merges)
return 0;
else if (opt->combine_merges)

Loading…
Cancel
Save