]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/line-log-merge-optim'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Aug 2025 18:28:57 +0000 (11:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Aug 2025 18:28:58 +0000 (11:28 -0700)
"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


Trivial merge