]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitc0396842938383c4de53fcdaf5f93bf36bde3be7
tree192d9312b187cb5ead41817bb29b9e3669a7338c
parentdd2a0d9d4f2d02d618b34c6155bc7f47a130fa61
parent0a15bb634cf005a0266ee1108ac31aa75649a61c
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