| commit | 04264d4079a4423f32d85d7833d63faa5ace4e33 | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 19 Jan 2021 19:53:41 +0000 (19 19:53 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2021 06:18:55 +0000 (20 22:18 -0800) | ||
| tree | 600e914836492015d5b7fbd0122397635f0a353c | treesnapshot (tar.gz zip) |
| parent | 112e11126b963923d84f90f12dae9b96271ccedb | commitdiff |
merge-ort: add outline of get_provisional_directory_renames()
This function is based on merge-recursive.c's get_directory_renames(),
except that the first half has been split out into a not-yet-implemented
compute_rename_counts(). The primary difference here is our lack of the
non_unique_new_dir boolean in our strmap. The lack of that field will
at first cause us to fail testcase 2b of t6423; however, future
optimizations will obviate the need for that ugly field so we have just
left it out.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This function is based on merge-recursive.c's get_directory_renames(),
except that the first half has been split out into a not-yet-implemented
compute_rename_counts(). The primary difference here is our lack of the
non_unique_new_dir boolean in our strmap. The lack of that field will
at first cause us to fail testcase 2b of t6423; however, future
optimizations will obviate the need for that ugly field so we have just
left it out.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |