diffcore-rename: reduce jumpiness in progress counters
authorElijah Newren <newren@gmail.com>
Fri, 11 Dec 2020 09:08:43 +0000 (09:08 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2020 17:34:50 +0000 (09:34 -0800)
commit81c4bf02964e51d0cde79304794d51da86d23b09
tree188d617e01525d95fd13a84659cd120944b88079
parentad8a1be529ea9e0bd6346a3cb1d53fec16e3bd10
diffcore-rename: reduce jumpiness in progress counters

Inexact rename detection works by comparing all sources to all
destinations, computing similarities, and then finding the best matches
among those that are sufficiently similar.

However, it is preceded by exact rename detection that works by
checking if there are files with identical hashes.  If exact renames are
found, we can exclude some files from inexact rename detection.

The inexact rename detection loops over the full set of files, but
immediately skips those for which rename_dst[i].is_rename is true and
thus doesn't compare any sources to that destination.  As such, these
paths shouldn't be included in the progress counter.

For the eagle eyed, this change hints at an actual optimization -- the
first one I presented at Git Merge 2020.  I'll be submitting that
optimization later, once the basic merge-ort algorithm has merged.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-rename.c