line-log: simplify condition checking for merge commits

In process_ranges_arbitrary_commit() the condition deciding whether
the given commit is not a merge, i.e. that it doesn't have more than
one parent, is head-scratchingly backwards, flip it.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/line-log.c b/line-log.c
index 71fa857ee83a79cc80a37d875b12b3be8cf0f432..188d387d40f58dba6fa1baa52fed138367117d6a 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -1273,10 +1273,10 @@ int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, struct commit
                        struct line_log_data *prange = line_log_data_copy(range);
                        add_line_range(rev, commit->parents->item, prange);
                        clear_commit_line_range(rev, commit);
-               } else if (!commit->parents || !commit->parents->next)
-                       changed = process_ranges_ordinary_commit(rev, commit, range);
-               else
+               } else if (commit->parents && commit->parents->next)
                        changed = process_ranges_merge_commit(rev, commit, range);
+               else
+                       changed = process_ranges_ordinary_commit(rev, commit, range);
        }
 
        if (!changed)