mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge-ort: miscellaneous touch-ups

Browse Source 
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>
This commit is contained in:
Elijah Newren 2021-06-08 16:11:42 +00:00 committed by Junio C Hamano
parent 356da0f98b
commit ef68c3d800
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-ort.c
View File

@ -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);
}