X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-objects.c;h=42778e87d077b99a2b5b8e456290cc0fab57a190;hb=2d9c58c69d1bab601e67b036d0546e85abcee7eb;hp=ed2eb278ec38b239f34135de2cd28b9f4b1cc3be;hpb=1ccf5a345a6e7974ec0380eed735c2db97e50b4c;p=git.git diff --git a/fsck-objects.c b/fsck-objects.c index ed2eb278..42778e87 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -11,6 +11,7 @@ #include "cache-tree.h" #define REACHABLE 0x0001 +#define SEEN 0x0002 static int show_root = 0; static int show_tags = 0; @@ -161,7 +162,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; @@ -205,7 +206,6 @@ static int fsck_tree(struct tree *item) } if (last) free(last); - item->entries = NULL; free(item->buffer); item->buffer = NULL; @@ -277,6 +277,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)