From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Aug 2025 01:18:17 +0000 (-0700)
Subject: Merge branch 'sg/line-log-merge-optim' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e110ef974a354cec3fd202c2beaa03a5fe58ad3b;p=thirdparty%2Fgit.git

Merge branch 'sg/line-log-merge-optim' into next

"git log -L..." compared trees of multiple parents with the tree of the
merge result in an unnecessarily inefficient way.

* sg/line-log-merge-optim:
  line-log: simplify condition checking for merge commits
  line-log: initialize diff queue in process_ranges_ordinary_commit()
  line-log: get rid of the parents array in process_ranges_merge_commit()
  line-log: avoid unnecessary tree diffs when processing merge commits
---

e110ef974a354cec3fd202c2beaa03a5fe58ad3b