Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into next

diff --git a/fetch.c b/fetch.c
index ae65b420569464fb83e715a69012751f1716075e..e040ef97b6b7e29d9e6482ad0ebead589e86a2a2 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"
@@ -37,27 +38,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;
 }
 
@@ -209,7 +216,7 @@ static int mark_complete(const char *path, const unsigned char *sha1)
 
 int pull(char *target)
 {
-       struct ref_lock *lock;
+       struct ref_lock *lock = NULL;
        unsigned char sha1[20];
        char *msg;
        int ret;
@@ -229,15 +236,18 @@ int pull(char *target)
 
        if (interpret_target(target, sha1)) {
                error("Could not interpret %s as something to pull", target);
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }
        if (process(lookup_unknown_object(sha1))) {
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }
        if (loop()) {
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }