mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dt/cache-tree-repair'

Browse Source 
Add a few more places in "commit" and "checkout" that make sure
that the cache-tree is fully populated in the index.

* dt/cache-tree-repair:
  cache-tree: do not try to use an invalidated subtree info to build a tree
  cache-tree: Write updated cache-tree after commit
  cache-tree: subdirectory tests
  test-dump-cache-tree: invalid trees are not errors
  cache-tree: create/update cache-tree on checkout
This commit is contained in:
Junio C Hamano
2014-09-11 10:33:32 -07:00
parent 01d678a226 4ed115e9c5
commit 3fd13cbcd5
6 changed files with 184 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-dump-cache-tree.c
View File

@ -26,16 +26,16 @@ static int dump_cache_tree(struct cache_tree *it,
return 0;
if (it->entry_count < 0) {
/* invalid */
dump_one(it, pfx, "");
dump_one(ref, pfx, "#(ref) ");
if (it->subtree_nr != ref->subtree_nr)
errs = 1;
}
else {
dump_one(it, pfx, "");
if (hashcmp(it->sha1, ref->sha1) ||
ref->entry_count != it->entry_count ||
ref->subtree_nr != it->subtree_nr) {
/* claims to be valid but is lying */
dump_one(ref, pfx, "#(ref) ");
errs = 1;
}