log_tree_diff: get rid of extra check for NULL

sorganov · gitster · commit 793d37c17ffa · 2020-09-06T10:33:19.000-07:00
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 &lt;sorganov@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/log-tree.c b/log-tree.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ static int log_tree_diff(struct rev_info opt, struct commit commit, struct log`
`917`	`917`	`}`
`918`	`918`
`919`	`919`	`/* More than one parent? */`
`920`		`- if (parents && parents->next) {`
	`920`	`+ if (parents->next) {`
`921`	`921`	`if (opt->ignore_merges)`
`922`	`922`	`return 0;`
`923`	`923`	`else if (opt->combine_merges)`