summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-07-16 05:22:34 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-20 14:47:39 -0700
commite0ef578eae4aea91920ef394a0d38170b39777d1 (patch)
tree00499f7b08f8ecf28b2740da66e3180b44738224 /mailmap.c
parentmerge-ort: add data structures for allowable trivial directory resolves (diff)
downloadtgif-e0ef578eae4aea91920ef394a0d38170b39777d1.tar.xz
merge-ort: add a handle_deferred_entries() helper function
In order to allow trivial directory resolution, we first need to be able to gather more information to determine if the optimization is safe. To enable that, we need a way of deferring the recursion into the directory until a later time. Naturally, deferring the entry into a subtree means that we need some function that will later recurse into the subdirectory exactly the same way that collect_merge_info_callback() would have done. Add a helper function that does this. For now this function is not used but a subsequent commit will change that. Future commits will also make the function sometimes resolve directories instead of traversing inside. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions