diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-17 14:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-17 14:31:26 -0800 |
| commit | 73f69f22e590c2ddc2c6fb678a5b11d9d0ba39fa (patch) | |
| tree | 3009eb67c05e69ccb782d7234cda170e24a9c459 /merge-recursive.c | |
| parent | Sync with 'maint' (diff) | |
| parent | cache API: add a "INDEX_STATE_INIT" macro/function, add release_index() (diff) | |
| download | git-73f69f22e590c2ddc2c6fb678a5b11d9d0ba39fa.tar.gz git-73f69f22e590c2ddc2c6fb678a5b11d9d0ba39fa.zip | |
Merge branch 'ab/cache-api-cleanup' into ab/cache-api-cleanup-users
* ab/cache-api-cleanup:
cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
read-cache.c: refactor set_new_index_sparsity() for subsequent commit
sparse-index API: BUG() out on NULL ensure_full_index()
sparse-index.c: expand_to_path() can assume non-NULL "istate"
builtin/difftool.c: { 0 }-initialize rather than using memset()
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) |