diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:33 -0800 |
| commit | 2f794620f5dda37405e4ba9b606061468eceed98 (patch) | |
| tree | 5536aa9904d3db0128ef6a50a0500a2d258c0d5f /sequencer.c | |
| parent | Merge branch 'rs/worktree-list-verbose' (diff) | |
| parent | t1092: test interesting sparse-checkout scenarios (diff) | |
| download | git-2f794620f5dda37405e4ba9b606061468eceed98.tar.gz git-2f794620f5dda37405e4ba9b606061468eceed98.zip | |
Merge branch 'ds/more-index-cleanups'
Cleaning various codepaths up.
* ds/more-index-cleanups:
t1092: test interesting sparse-checkout scenarios
test-lib: test_region looks for trace2 regions
sparse-checkout: load sparse-checkout patterns
name-hash: use trace2 regions for init
repository: add repo reference to index_state
fsmonitor: de-duplicate BUG()s around dirty bits
cache-tree: extract subtree_pos()
cache-tree: simplify verify_cache() prototype
cache-tree: clean up cache_tree_update()
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index 264d494a64..d2332d3e17 100644 --- a/sequencer.c +++ b/sequencer.c @@ -679,9 +679,6 @@ static int do_recursive_merge(struct repository *r, static struct object_id *get_cache_tree_oid(struct index_state *istate) { - if (!istate->cache_tree) - istate->cache_tree = cache_tree(); - if (!cache_tree_fully_valid(istate->cache_tree)) if (cache_tree_update(istate, 0)) { error(_("unable to update cache tree")); |