mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
3fd13cbcd5
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
68 lines
1.6 KiB
C
68 lines
1.6 KiB
C
#include "cache.h"
|
|
#include "tree.h"
|
|
#include "cache-tree.h"
|
|
|
|
|
|
static void dump_one(struct cache_tree *it, const char *pfx, const char *x)
|
|
{
|
|
if (it->entry_count < 0)
|
|
printf("%-40s %s%s (%d subtrees)\n",
|
|
"invalid", x, pfx, it->subtree_nr);
|
|
else
|
|
printf("%s %s%s (%d entries, %d subtrees)\n",
|
|
sha1_to_hex(it->sha1), x, pfx,
|
|
it->entry_count, it->subtree_nr);
|
|
}
|
|
|
|
static int dump_cache_tree(struct cache_tree *it,
|
|
struct cache_tree *ref,
|
|
const char *pfx)
|
|
{
|
|
int i;
|
|
int errs = 0;
|
|
|
|
if (!it || !ref)
|
|
/* missing in either */
|
|
return 0;
|
|
|
|
if (it->entry_count < 0) {
|
|
/* invalid */
|
|
dump_one(it, pfx, "");
|
|
dump_one(ref, pfx, "#(ref) ");
|
|
}
|
|
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;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < it->subtree_nr; i++) {
|
|
char path[PATH_MAX];
|
|
struct cache_tree_sub *down = it->down[i];
|
|
struct cache_tree_sub *rdwn;
|
|
|
|
rdwn = cache_tree_sub(ref, down->name);
|
|
sprintf(path, "%s%.*s/", pfx, down->namelen, down->name);
|
|
if (dump_cache_tree(down->cache_tree, rdwn->cache_tree, path))
|
|
errs = 1;
|
|
}
|
|
return errs;
|
|
}
|
|
|
|
int main(int ac, char **av)
|
|
{
|
|
struct index_state istate;
|
|
struct cache_tree *another = cache_tree();
|
|
if (read_cache() < 0)
|
|
die("unable to read index file");
|
|
istate = the_index;
|
|
istate.cache_tree = another;
|
|
cache_tree_update(&istate, WRITE_TREE_DRY_RUN);
|
|
return dump_cache_tree(active_cache_tree, another, "");
|
|
}
|