[v2,5/5] merge-ort: miscellaneous touch-ups

Commit Message

Elijah Newren June 1, 2021, 2:58 p.m. UTC

From: Elijah Newren <[e-mail]>

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 <[e-mail]>
---
 merge-ort.c | 5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/merge-ort.c b/merge-ort.c
index 14b3e14bbe47..d428b73dedd4 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -765,6 +765,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;
@@ -772,6 +773,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,
@@ -3483,6 +3486,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);
 }