git-svn: fix handling of filenames with embedded '@'

diff --git a/fetch.c b/fetch.c
index ec2d8c3d9b3db7fff74af6c149db9d93c6882efd..cf6c99490c234c5854146f8f6e72d8c615517eea 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -9,6 +9,7 @@
 #include "refs.h"
 
 const char *write_ref = NULL;
+const char *write_ref_log_details = NULL;
 
 int get_tree = 0;
 int get_history = 0;
@@ -46,13 +47,20 @@ static int process_tree(struct tree *tree)
        desc.buf = tree->buffer;
        desc.size = tree->size;
        while (tree_entry(&desc, &entry)) {
+               struct object *obj = NULL;
+
                if (S_ISDIR(entry.mode)) {
                        struct tree *tree = lookup_tree(entry.sha1);
-                       process_tree(tree);
-               } else {
+                       if (tree)
+                               obj = &tree->object;
+               }
+               else {
                        struct blob *blob = lookup_blob(entry.sha1);
-                       process(&blob->object);
+                       if (blob)
+                               obj = &blob->object;
                }
+               if (!obj || process(obj))
+                       return -1;
        }
        free(tree->buffer);
        tree->buffer = NULL;
@@ -142,7 +150,8 @@ static int process(struct object *obj)
        if (has_sha1_file(obj->sha1)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
-       } else {
+       }
+       else {
                if (obj->flags & COMPLETE)
                        return 0;
                prefetch(obj->sha1);
@@ -208,23 +217,52 @@ static int mark_complete(const char *path, const unsigned char *sha1)
 
 int pull(char *target)
 {
+       struct ref_lock *lock = NULL;
        unsigned char sha1[20];
+       char *msg;
+       int ret;
 
        save_commit_buffer = 0;
        track_object_refs = 0;
+       if (write_ref) {
+               lock = lock_ref_sha1(write_ref, NULL, 0);
+               if (!lock) {
+                       error("Can't lock ref %s", write_ref);
+                       return -1;
+               }
+       }
 
        if (!get_recover)
                for_each_ref(mark_complete);
 
-       if (interpret_target(target, sha1))
-               return error("Could not interpret %s as something to pull",
-                            target);
-       if (process(lookup_unknown_object(sha1)))
+       if (interpret_target(target, sha1)) {
+               error("Could not interpret %s as something to pull", target);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
-       if (loop())
+       }
+       if (process(lookup_unknown_object(sha1))) {
+               if (lock)
+                       unlock_ref(lock);
+               return -1;
+       }
+       if (loop()) {
+               if (lock)
+                       unlock_ref(lock);
                return -1;
-       
-       if (write_ref)
-               write_ref_sha1_unlocked(write_ref, sha1);
+       }
+
+       if (write_ref) {
+               if (write_ref_log_details) {
+                       msg = xmalloc(strlen(write_ref_log_details) + 12);
+                       sprintf(msg, "fetch from %s", write_ref_log_details);
+               }
+               else
+                       msg = NULL;
+               ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
+               if (msg)
+                       free(msg);
+               return ret;
+       }
        return 0;
 }