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>
SZEDER Gábor committed
Aug 24, 2025 at 21:06 UTC
0a15bb634cf005a0266ee1108ac31aa75649a61c
1 file changed
+3
-3
line-log.c
+3
-3
@@ -1273,10 +1273,10 @@ int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, struct commit
1273
struct line_log_data *prange = line_log_data_copy(range);
1274
add_line_range(rev, commit->parents->item, prange);
1275
clear_commit_line_range(rev, commit);
1276
- } else if (!commit->parents || !commit->parents->next)
1277
- changed = process_ranges_ordinary_commit(rev, commit, range);
1278
- else
1276
+ } else if (commit->parents && commit->parents->next)
1277
changed = process_ranges_merge_commit(rev, commit, range);
1278
+ else
1279
+ changed = process_ranges_ordinary_commit(rev, commit, range);
1280
}
1281
1282
if (!changed)