fetch.c: do not call process_tree() from process_tree().

[git.git] / fetch.c

diff --git a/fetch.c b/fetch.c
index d9fe41f..107504b 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,27 +37,33 @@ static int process(struct object *obj);
 
 static int process_tree(struct tree *tree)
 {
-       struct tree_entry_list *entry;
+       struct tree_desc desc;
+       struct name_entry entry;
 
        if (parse_tree(tree))
                return -1;
 
-       entry = create_tree_entry_list(tree);
-       while (entry) {
-               struct tree_entry_list *next = entry->next;
+       desc.buf = tree->buffer;
+       desc.size = tree->size;
+       while (tree_entry(&desc, &entry)) {
+               struct object *obj = NULL;
 
-               if (entry->directory) {
-                       struct tree *tree = lookup_tree(entry->sha1);
-                       process_tree(tree);
-               } else {
-                       struct blob *blob = lookup_blob(entry->sha1);
-                       process(&blob->object);
+               if (S_ISDIR(entry.mode)) {
+                       struct tree *tree = lookup_tree(entry.sha1);
+                       if (tree)
+                               obj = &tree->object;
                }
-               free(entry);
-               entry = next;
+               else {
+                       struct blob *blob = lookup_blob(entry.sha1);
+                       if (blob)
+                               obj = &blob->object;
+               }
+               if (!obj || process(obj))
+                       return -1;
        }
        free(tree->buffer);
        tree->buffer = NULL;
+       tree->size = 0;
        return 0;
 }