merge-ort: miscellaneous touch-ups

Add some notes in the code about invariants with match_mask when adding
pairs.  Also add a comment that seems to have been left out in my work
of pushing these changes upstream.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index a3bb3e113270bf1e804d155d018233defba92d4b..53571742a0b7f68fd3215840621690f818cbac35 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -764,6 +764,7 @@ static void add_pair(struct merge_options *opt,
        int names_idx = is_add ? side : 0;
 
        if (is_add) {
+               assert(match_mask == 0 || match_mask == 6);
                if (strset_contains(&renames->cached_target_names[side],
                                    pathname))
                        return;
@@ -771,6 +772,8 @@ static void add_pair(struct merge_options *opt,
                unsigned content_relevant = (match_mask == 0);
                unsigned location_relevant = (dir_rename_mask == 0x07);
 
+               assert(match_mask == 0 || match_mask == 3 || match_mask == 5);
+
                /*
                 * If pathname is found in cached_irrelevant[side] due to
                 * previous pick but for this commit content is relevant,
@@ -3485,6 +3488,8 @@ static void process_entry(struct merge_options *opt,
         */
        if (!ci->merged.clean)
                strmap_put(&opt->priv->conflicted, path, ci);
+
+       /* Record metadata for ci->merged in dir_metadata */
        record_entry_for_tree(dir_metadata, path, &ci->merged);
 }