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 /builtin/checkout.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 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index c9ba23c279..2d6550bc3c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -821,9 +821,6 @@ static int merge_working_tree(const struct checkout_opts *opts, } } - if (!active_cache_tree) - active_cache_tree = cache_tree(); - if (!cache_tree_fully_valid(active_cache_tree)) cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); |