diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:44 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:38:47 -0800 |
| commit | 04af1879b9313a83aea46791bad8963e14e7651e (patch) | |
| tree | 40bff56e648c27eb8a7a84b5da5f98da53bf0e89 /t/t4013/diff.log_-m_-p_--first-parent_master | |
| parent | merge-ort: add a paths_to_free field to merge_options_internal (diff) | |
| download | tgif-04af1879b9313a83aea46791bad8963e14e7651e.tar.xz | |
merge-ort: add function grouping comments
Commit b658536f59 ("merge-ort: add some high-level algorithm structure",
2020-10-27) added high-level structure of the ort merge algorithm. As
we have added more and more functions, that high-level structure has
been slightly obscured. Since functions are still grouped according to
this high-level structure, add comments denoting sections where all the
functions are specifically tied to a piece of the high-level structure.
This function groupings include a few sub-divisions of the original
high-level structure, including some sub-divisions that are yet to be
submitted. Each has (or will have) several functions all serving as
helpers to one or two main functions for each section.
As an added bonus, the comments will serve to provide a small textual
separation between nearby sections and allow the next three patch series
to be submitted independently and merge cleanly.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.log_-m_-p_--first-parent_master')
0 files changed, 0 insertions, 0 deletions