Move computation of dir_rename_count from merge-ort to diffcore-rename
commit0c4fd732f043be570e08b51c475ff9f2e2066912
authorElijah Newren <newren@gmail.com>
Sat, 27 Feb 2021 00:30:42 +0000 (27 00:30 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Feb 2021 01:53:11 +0000 (26 17:53 -0800)
tree3571da9673190b17d3badd22f225d1a3f553346c
parentae8cf74d3f9e76332138ee8bb911b3fa53f17bbf
Move computation of dir_rename_count from merge-ort to diffcore-rename

Move the computation of dir_rename_count from merge-ort.c to
diffcore-rename.c, making slight adjustments to the data structures
based on the move.  While the diffstat looks large, viewing this commit
with --color-moved makes it clear that only about 20 lines changed.

With this patch, the computation of dir_rename_count is still only done
after inexact rename detection, but subsequent commits will add a
preliminary computation of dir_rename_count after exact rename
detection, followed by some updates after inexact rename detection.

Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-rename.c
diffcore.h
merge-ort.c