diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-04 23:28:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 23:28:53 +0300 |
| commit | 506d2a354a9b24c531634094292b11ed8b8c2514 (patch) | |
| tree | 2324d28eddd75395949471683f6eeec9781d841d /cache-tree.c | |
| parent | 58705b490314cb9a6f70916b4b69062b66ca7130 (diff) | |
| parent | e05cdb17e89a2d3257533d47350b3138bfce8737 (diff) | |
Merge branch 'ds/commit-and-checkout-with-sparse-index'
"git checkout" and "git commit" learn to work without unnecessarily
expanding sparse indexes.
* ds/commit-and-checkout-with-sparse-index:
unpack-trees: resolve sparse-directory/file conflicts
t1092: document bad 'git checkout' behavior
checkout: stop expanding sparse indexes
sparse-index: recompute cache-tree
commit: integrate with sparse-index
p2000: compress repo names
p2000: add 'git checkout -' test and decrease depth
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 9ba2c7c6b2..90919f9e34 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -465,8 +465,6 @@ int cache_tree_update(struct index_state *istate, int flags) if (i) return i; - ensure_full_index(istate); - if (!istate->cache_tree) istate->cache_tree = cache_tree(); |