| commit | 3ffbe5a223aa1ed46d6f20da607d42341a8c2bf4 | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 5 Jul 2022 01:33:42 +0000 (5 01:33 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Jul 2022 16:39:46 +0000 (6 09:39 -0700) | ||
| tree | c7f42ccb87bf7e6abf22e90065c2ebe8d6e18a92 | treesnapshot (tar.gz zip) |
| parent | 6dd1f0e9d446e9ec1da3583eb7d6959716fc31f6 | commitdiff |
merge-ort: shuffle the computation and cleanup of potential collisions
Run compute_collisions() for renames on both sides of history before
any calls to collect_renames(), and do not free the computed collisions
until after both calls to collect_renames(). This is just a code
reorganization at this point that doesn't make sense on its own, but
will permit us to use the computed collision info from both sides
within each call to collect_renames() in a subsequent commit.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Run compute_collisions() for renames on both sides of history before
any calls to collect_renames(), and do not free the computed collisions
until after both calls to collect_renames(). This is just a code
reorganization at this point that doesn't make sense on its own, but
will permit us to use the computed collision info from both sides
within each call to collect_renames() in a subsequent commit.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |