From: Simon Hausmann Date: Wed, 23 May 2007 21:01:49 +0000 (+0200) Subject: fast-import: Fix crash when referencing already existing objects X-Git-Tag: v1.5.2.1~17^2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20f546a86c5c673fc49050479a12edfb9f8672bf;p=git.git fast-import: Fix crash when referencing already existing objects 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 Signed-off-by: Shawn O. Pearce --- diff --git a/fast-import.c b/fast-import.c index 03f5ca799..f308db763 100644 --- a/fast-import.c +++ b/fast-import.c @@ -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;