diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-01-12 13:55:27 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-16 10:46:58 -0800 |
commit | 2f6b1eb794ee1f152c1a4b519e3b6dcecd0b487f (patch) | |
tree | ce148cd756ca33dd7147a7136eb33c30530da8eb /merge-recursive.c | |
parent | 5bdf6d4ac0d06817ce22322aa0172b49e6026544 (diff) | |
download | git-2f6b1eb794ee1f152c1a4b519e3b6dcecd0b487f.tar.gz |
cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
Hopefully in some not so distant future, we'll get advantages from always
initializing the "repo" member of the "struct index_state". To make
that easier let's introduce an initialization macro & function.
The various ad-hoc initialization of the structure can then be changed
over to it, and we can remove the various "0" assignments in
discard_index() in favor of calling index_state_init() at the end.
While not strictly necessary, let's also change the CALLOC_ARRAY() of
various "struct index_state *" to use an ALLOC_ARRAY() followed by
index_state_init() instead.
We're then adding the release_index() function and converting some
callers (including some of these allocations) over to it if they
either won't need to use their "struct index_state" again, or are just
about to call index_state_init().
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2fd0aa9687..0948b3ea96 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -412,7 +412,7 @@ static int unpack_trees_start(struct merge_options *opt, { int rc; struct tree_desc t[3]; - struct index_state tmp_index = { NULL }; + struct index_state tmp_index = INDEX_STATE_INIT; memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts)); if (opt->priv->call_depth) |