admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge-ort: extract handling of priv member into reusable function

Browse Source 
In preparation for a subsequent commit which will ensure we do not
forget to maintain our invariants for the priv member in error
codepaths, extract the necessary functionality out into a separate
function.  This change is cosmetic at this point, and introduces no
changes beyond an extra assertion sanity check.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2024-06-19 03:00:13 +00:00
committed by Junio C Hamano
parent d63586cb31
commit e79bdb426c
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
merge-ort.c
View File

@@ -5000,6 +5000,26 @@ static void merge_check_renames_reusable(struct merge_result *result,
/*** Function Grouping: merge_incore_*() and their internal variants ***/ /*** Function Grouping: merge_incore_*() and their internal variants ***/
static void move_opt_priv_to_result_priv(struct merge_options *opt,
struct merge_result *result)
{
/*
* opt->priv and result->priv are a bit weird. opt->priv contains
* information that we can re-use in subsequent merge operations to
* enable our cached renames optimization. The best way to provide
* that to subsequent merges is putting it in result->priv.
* However, putting it directly there would mean retrofitting lots
* of functions in this file to also take a merge_result pointer,
* which is ugly and annoying. So, we just make sure at the end of
* the merge (the outer merge if there are internal recursive ones)
* to move it.
*/
assert(opt->priv && !result->priv);
result->priv = opt->priv;
result->_properly_initialized = RESULT_INITIALIZED;
opt->priv = NULL;
}
/* /*
* Originally from merge_trees_internal(); heavily adapted, though. * Originally from merge_trees_internal(); heavily adapted, though.
*/ */
@@ -5060,11 +5080,8 @@ redo:
/* existence of conflicted entries implies unclean */ /* existence of conflicted entries implies unclean */
result->clean &= strmap_empty(&opt->priv->conflicted); result->clean &= strmap_empty(&opt->priv->conflicted);
} }
if (!opt->priv->call_depth) { if (!opt->priv->call_depth)
result->priv = opt->priv; move_opt_priv_to_result_priv(opt, result);
result->_properly_initialized = RESULT_INITIALIZED;
opt->priv = NULL;
}
} }
/* /*