X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=fsck-objects.c;h=ec99a7a6cbed9efeeb6e745a6a288817878b7856;hb=097dc3d8c32f4b85bf9701d5e1de98999ac25c1c;hp=44b646540a84f1d4afe319376d81c495eb232503;hpb=2522c13244c13fe3a9f0769ea6294dce08e6596c;p=git.git diff --git a/fsck-objects.c b/fsck-objects.c index 44b64654..ec99a7a6 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -10,6 +10,7 @@ #include "pack.h" #define REACHABLE 0x0001 +#define SEEN 0x0002 static int show_root = 0; static int show_tags = 0; @@ -160,7 +161,7 @@ static int fsck_tree(struct tree *item) struct tree_entry_list *entry, *last; last = NULL; - for (entry = item->entries; entry; entry = entry->next) { + for (entry = create_tree_entry_list(item); entry; entry = entry->next) { if (strchr(entry->name, '/')) has_full_path = 1; has_zero_pad |= entry->zeropad; @@ -204,7 +205,6 @@ static int fsck_tree(struct tree *item) } if (last) free(last); - item->entries = NULL; free(item->buffer); item->buffer = NULL; @@ -276,6 +276,9 @@ static int fsck_sha1(unsigned char *sha1) struct object *obj = parse_object(sha1); if (!obj) return error("%s: object not found", sha1_to_hex(sha1)); + if (obj->flags & SEEN) + return 0; + obj->flags |= SEEN; if (obj->type == blob_type) return 0; if (obj->type == tree_type)