]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: drop unused parameters from detect_and_process_renames()
authorJeff King <peff@peff.net>
Thu, 14 Sep 2023 09:39:58 +0000 (05:39 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2023 19:01:29 +0000 (12:01 -0700)
commitfce9ffb2253660346c826a969c2b49a485e70cbd
tree6401bdcfd24c455ecb9166d51a3a01d77f343673
parent1c9419ae9d262dab33bef22dea5c166d990b921e
merge-ort: drop unused parameters from detect_and_process_renames()

This function takes three trees representing the merge base and both
sides of the merge, but never looks at any of them. This is due to
f78cf97617 (merge-ort: call diffcore_rename() directly, 2021-02-14).
Prior to that commit, we passed pairs of trees to diff_tree_oid(). But
after that commit, we collect a custom diff_queue for each pair in the
merge_options struct, and just run diffcore_rename() on the result. So
the function does not need to know about the original trees at all
anymore.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c