[PATCH 4/4] line-log: simplify condition checking for merge commits
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- Aug 24, 2025, 19:06 UTC
- Message-ID
- <20250824190644.2573279-5-szeder.dev@gmail.com>
- In-Reply-To
- <20250824190644.2573279-1-szeder.dev@gmail.com>
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> --- line-log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/line-log.c b/line-log.c index 71fa857ee8..188d387d40 100644 --- 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)
-- 2.51.0.433.g1a66b3fb12