git-svnimport: Improved detection of merges.

diff --git a/fetch.c b/fetch.c
index 21b373d198d7ecbed7d0052824ff130471a19fa2..f7f8902580f0f5e4eb7a63000f9987e63715cd09 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -9,12 +9,11 @@
 
 const char *write_ref = NULL;
 
-const unsigned char *current_ref = NULL;
-
 int get_tree = 0;
 int get_history = 0;
 int get_all = 0;
 int get_verbosely = 0;
+int get_recover = 0;
 static unsigned char current_commit_sha1[20];
 
 void pull_say(const char *fmt, const char *hex) 
@@ -48,15 +47,16 @@ static int process_tree(struct tree *tree)
                struct tree_entry_list *next = entry->next;
                if (process(entry->item.any))
                        return -1;
+               free(entry->name);
                free(entry);
                entry = next;
        }
        return 0;
 }
 
-#define COMPLETE       1U
-#define TO_SCAN                4U
-#define SEEN           16U
+#define COMPLETE       (1U << 0)
+#define SEEN           (1U << 1)
+#define TO_SCAN                (1U << 2)
 
 static struct commit_list *complete = NULL;
 
@@ -134,7 +134,6 @@ static int process(struct object *obj)
        obj->flags |= SEEN;
 
        if (has_sha1_file(obj->sha1)) {
-               parse_object(obj->sha1);
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
        } else {
@@ -164,7 +163,7 @@ static int loop(void)
                 * the queue because we needed to fetch it first.
                 */
                if (! (obj->flags & TO_SCAN)) {
-                       if (!has_sha1_file(obj->sha1) && fetch(obj->sha1)) {
+                       if (fetch(obj->sha1)) {
                                report_missing(obj->type
                                               ? obj->type
                                               : "object", obj->sha1);
@@ -204,16 +203,12 @@ static int mark_complete(const char *path, const unsigned char *sha1)
 int pull(char *target)
 {
        unsigned char sha1[20];
-       int fd = -1;
 
        save_commit_buffer = 0;
-       if (write_ref && current_ref) {
-               fd = lock_ref_sha1(write_ref, current_ref);
-               if (fd < 0)
-                       return -1;
-       }
+       track_object_refs = 0;
 
-       for_each_ref(mark_complete);
+       if (!get_recover)
+               for_each_ref(mark_complete);
 
        if (interpret_target(target, sha1))
                return error("Could not interpret %s as something to pull",
@@ -223,12 +218,7 @@ int pull(char *target)
        if (loop())
                return -1;
        
-       if (write_ref) {
-               if (current_ref) {
-                       write_ref_sha1(write_ref, fd, sha1);
-               } else {
-                       write_ref_sha1_unlocked(write_ref, sha1);
-               }
-       }
+       if (write_ref)
+               write_ref_sha1_unlocked(write_ref, sha1);
        return 0;
 }