fast-import: Fix crash when referencing already existing objects
authorSimon Hausmann <simon@lst.de>
Wed, 23 May 2007 21:01:49 +0000 (23:01 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 24 May 2007 03:36:47 +0000 (23:36 -0400)
Commit a5c1780a0355a71b9fb70f1f1977ce726ee5b8d8 sets the pack_id of existing
objects to MAX_PACK_ID. When the same object is referenced later again it is
found in the local object hash. With such a pack_id fast-import should not try
to locate that object in the newly created pack(s).

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
fast-import.c

index 03f5ca7998a16203e72a15ee1f167fcfe8102861..f308db76300986ce46abe7df60c6f9c73b50234a 100644 (file)
@@ -1013,7 +1013,7 @@ static void load_tree(struct tree_entry *root)
                return;
 
        myoe = find_object(sha1);
-       if (myoe) {
+       if (myoe && myoe->pack_id != MAX_PACK_ID) {
                if (myoe->type != OBJ_TREE)
                        die("Not a tree: %s", sha1_to_hex(sha1));
                t->delta_depth = 0;