diff options
| -rw-r--r-- | cache-tree.c | 20 | ||||
| -rw-r--r-- | cache-tree.h | 2 | ||||
| -rw-r--r-- | dump-cache-tree.c | 56 | ||||
| -rw-r--r-- | write-tree.c | 2 |
4 files changed, 62 insertions, 18 deletions
diff --git a/cache-tree.c b/cache-tree.c index 35740b3647..a10902fd30 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -226,7 +226,8 @@ static int update_one(struct cache_tree *it, int entries, const char *base, int baselen, - int missing_ok) + int missing_ok, + int dryrun) { unsigned long size, offset; char *buffer; @@ -273,7 +274,8 @@ static int update_one(struct cache_tree *it, cache + i, entries - i, path, baselen + sublen + 1, - missing_ok); + missing_ok, + dryrun); i += subcnt - 1; sub->used = 1; } @@ -338,7 +340,14 @@ static int update_one(struct cache_tree *it, #endif } - write_sha1_file(buffer, offset, tree_type, it->sha1); + if (dryrun) { + char hdr[200]; + int hdrlen; + write_sha1_file_prepare(buffer, offset, tree_type, it->sha1, + hdr, &hdrlen); + } + else + write_sha1_file(buffer, offset, tree_type, it->sha1); free(buffer); it->entry_count = i; #if DEBUG @@ -352,13 +361,14 @@ static int update_one(struct cache_tree *it, int cache_tree_update(struct cache_tree *it, struct cache_entry **cache, int entries, - int missing_ok) + int missing_ok, + int dryrun) { int i; i = verify_cache(cache, entries); if (i) return i; - i = update_one(it, cache, entries, "", 0, missing_ok); + i = update_one(it, cache, entries, "", 0, missing_ok, dryrun); if (i < 0) return i; return 0; diff --git a/cache-tree.h b/cache-tree.h index 5d824df2ec..72c64801f5 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -26,6 +26,6 @@ void *cache_tree_write(struct cache_tree *root, unsigned long *size_p); struct cache_tree *cache_tree_read(const char *buffer, unsigned long size); int cache_tree_fully_valid(struct cache_tree *); -int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int); +int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int); #endif diff --git a/dump-cache-tree.c b/dump-cache-tree.c index f6a19bac3d..fbea263dd9 100644 --- a/dump-cache-tree.c +++ b/dump-cache-tree.c @@ -2,30 +2,64 @@ #include "tree.h" #include "cache-tree.h" -static void dump_cache_tree(struct cache_tree *it, const char *pfx) + +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) return; - if (it->entry_count < 0) - printf("%-40s %s (%d subtrees)\n", "invalid", pfx, - it->subtree_nr); - else - printf("%s %s (%d entries, %d subtrees)\n", - sha1_to_hex(it->sha1), - pfx, it->entry_count, it->subtree_nr); + if (!ref) + die("internal error"); + + if (it->entry_count < 0) { + dump_one(it, pfx, ""); + dump_one(ref, pfx, "#(ref) "); + if (it->subtree_nr != ref->subtree_nr) + errs = 1; + } + else { + dump_one(it, pfx, ""); + if (memcmp(it->sha1, ref->sha1, 20) || + ref->entry_count != it->entry_count || + ref->subtree_nr != it->subtree_nr) { + 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); - dump_cache_tree(down->cache_tree, path); + if (dump_cache_tree(down->cache_tree, rdwn->cache_tree, path)) + errs = 1; } + return errs; } int main(int ac, char **av) { + struct cache_tree *another = cache_tree(); if (read_cache() < 0) die("unable to read index file"); - dump_cache_tree(active_cache_tree, ""); - return 0; + cache_tree_update(another, active_cache, active_nr, 0, 1); + return dump_cache_tree(active_cache_tree, another, ""); } diff --git a/write-tree.c b/write-tree.c index a5069921a0..7a4f691d8a 100644 --- a/write-tree.c +++ b/write-tree.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) if (!was_valid) { if (cache_tree_update(active_cache_tree, active_cache, active_nr, - missing_ok) < 0) + missing_ok, 0) < 0) die("git-write-tree: error building trees"); if (0 <= newfd) { if (!write_cache(newfd, active_cache, active_nr)) |