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 /builtin/worktree.c | |
| parent | a7caae2729742fc80147bca1c02ae848cb55921a (diff) | |
| parent | 2f6b1eb794ee1f152c1a4b519e3b6dcecd0b487f (diff) | |
| download | git-73f69f22e590c2ddc2c6fb678a5b11d9d0ba39fa.tar.gz | |
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 'builtin/worktree.c')
| -rw-r--r-- | builtin/worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 591d659fae..311d6e9075 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -923,7 +923,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix) static void validate_no_submodules(const struct worktree *wt) { - struct index_state istate = { NULL }; + struct index_state istate = INDEX_STATE_INIT; struct strbuf path = STRBUF_INIT; int i, found_submodules = 0; |