Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2

[git.git] / fetch.c

diff --git a/fetch.c b/fetch.c
index f7f8902..976a5a4 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -3,6 +3,7 @@
 #include "cache.h"
 #include "commit.h"
 #include "tree.h"
+#include "tree-walk.h"
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
@@ -36,21 +37,32 @@ static int process(struct object *obj);
 
 static int process_tree(struct tree *tree)
 {
-       struct tree_entry_list *entry;
+       struct tree_desc desc;
 
        if (parse_tree(tree))
                return -1;
 
-       entry = tree->entries;
-       tree->entries = NULL;
-       while (entry) {
-               struct tree_entry_list *next = entry->next;
-               if (process(entry->item.any))
-                       return -1;
-               free(entry->name);
-               free(entry);
-               entry = next;
+       desc.buf = tree->buffer;
+       desc.size = tree->size;
+       while (desc.size) {
+               unsigned mode;
+               const char *name;
+               const unsigned char *sha1;
+
+               sha1 = tree_entry_extract(&desc, &name, &mode);
+               update_tree_entry(&desc);
+
+               if (S_ISDIR(mode)) {
+                       struct tree *tree = lookup_tree(sha1);
+                       process_tree(tree);
+               } else {
+                       struct blob *blob = lookup_blob(sha1);
+                       process(&blob->object);
+               }
        }
+       free(tree->buffer);
+       tree->buffer = NULL;
+       tree->size = 0;
        return 0;
 }