summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-05-23 21:01:49 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-05-24 03:36:47 (GMT)
commit20f546a86c5c673fc49050479a12edfb9f8672bf (patch)
tree9d5ddbe14658f5ba34e9c89efaf0a4f9ca8cf201 /fast-import.c
parentb259157f3c8705e0f775a3df2b33198499aede4f (diff)
downloadgit-20f546a86c5c673fc49050479a12edfb9f8672bf.zip
git-20f546a86c5c673fc49050479a12edfb9f8672bf.tar.gz
git-20f546a86c5c673fc49050479a12edfb9f8672bf.tar.bz2
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 <simon@lst.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 03f5ca7..f308db7 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;