Remove "tree->entries" tree-entry list from tree parser

[git.git] / fsck-objects.c

diff --git a/fsck-objects.c b/fsck-objects.c
index 59b2590..42778e8 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -8,8 +8,10 @@
 #include "tag.h"
 #include "refs.h"
 #include "pack.h"
+#include "cache-tree.h"
 
 #define REACHABLE 0x0001
+#define SEEN      0x0002
 
 static int show_root = 0;
 static int show_tags = 0;
@@ -160,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;
@@ -197,17 +199,15 @@ static int fsck_tree(struct tree *item)
                        default:
                                break;
                        }
-                       free(last->name);
                        free(last);
                }
 
                last = entry;
        }
-       if (last) {
-               free(last->name);
+       if (last)
                free(last);
-       }
-       item->entries = NULL;
+       free(item->buffer);
+       item->buffer = NULL;
 
        retval = 0;
        if (has_full_path) {
@@ -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)
@@ -438,10 +441,33 @@ static int fsck_head_link(void)
        return 0;
 }
 
+static int fsck_cache_tree(struct cache_tree *it)
+{
+       int i;
+       int err = 0;
+
+       if (0 <= it->entry_count) {
+               struct object *obj = parse_object(it->sha1);
+               if (!obj) {
+                       error("%s: invalid sha1 pointer in cache-tree",
+                             sha1_to_hex(it->sha1));
+                       return 1;
+               }
+               mark_reachable(obj, REACHABLE);
+               obj->used = 1;
+               if (obj->type != tree_type)
+                       err |= objerror(obj, "non-tree in cache-tree");
+       }
+       for (i = 0; i < it->subtree_nr; i++)
+               err |= fsck_cache_tree(it->down[i]->cache_tree);
+       return err;
+}
+
 int main(int argc, char **argv)
 {
        int i, heads;
 
+       track_object_refs = 1;
        setup_git_directory();
 
        for (i = 1; i < argc; i++) {
@@ -547,6 +573,8 @@ int main(int argc, char **argv)
                        obj->used = 1;
                        mark_reachable(obj, REACHABLE);
                }
+               if (active_cache_tree)
+                       fsck_cache_tree(active_cache_tree);
        }
 
        check_connectivity();