averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ds/commit-and-checkout-with-sparse-index'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2021-08-04 13:28:53 -07:00
parent 58705b4903 e05cdb17e8
commit 506d2a354a
7 changed files with 240 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache-tree.c
View File

@@ -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();