From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Aug 2025 18:28:57 +0000 (-0700)
Subject: Merge branch 'sg/line-log-merge-optim'
X-Git-Tag: v2.52.0-rc0~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0396842938383c4de53fcdaf5f93bf36bde3be7;p=thirdparty%2Fgit.git

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

"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
---

c0396842938383c4de53fcdaf5f93bf36bde3be7