diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-19 19:53:46 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-20 22:18:55 -0800 |
| commit | d9d015df4a3d794ec889dc70902d28f3ca87d817 (patch) | |
| tree | f0ae3782bc649be5fbeff30eb1df30ae42e74280 /Documentation/git-sh-setup.txt | |
| parent | merge-ort: modify collect_renames() for directory rename handling (diff) | |
| download | tgif-d9d015df4a3d794ec889dc70902d28f3ca87d817.tar.xz | |
merge-ort: implement compute_collisions()
This is nearly a wholesale copy of compute_collisions() from
merge-recursive.c, and the logic remains the same, but it has been
tweaked slightly due to:
* using strmap.h API (instead of direct hashmaps)
* allocation/freeing of data structures were done separately in
merge_start() and clear_or_reinit_internal_opts() in an earlier
patch in this series
* there is no non_unique_new_dir data field in merge-ort; that will
be handled a different way
It does depend on two new functions, apply_dir_rename() and
check_dir_renamed() which were introduced with simple
die-not-yet-implemented shells and will be implemented in subsequent
patches.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-sh-setup.txt')
0 files changed, 0 insertions, 0 deletions