X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=fast-import.c;h=b44d6a467ef17f3d2f541475ab1f4ce968504a5e;hb=57d4660468ef2674bb6afc2c5814d4b397a5eda9;hp=6dfdd6801c720f3b693ca6b09f8b7b3cf0f0c764;hpb=bd48ccf4a4daca79a1e828dec7bee91c4aebc81e;p=thirdparty%2Fgit.git diff --git a/fast-import.c b/fast-import.c index 6dfdd6801c..b44d6a467e 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2410,7 +2410,8 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa oidcpy(&commit_oid, &commit_oe->idx.oid); } else if (!get_oid(p, &commit_oid)) { unsigned long size; - char *buf = read_object_with_reference(&commit_oid, + char *buf = read_object_with_reference(the_repository, + &commit_oid, commit_type, &size, &commit_oid); if (!buf || size < the_hash_algo->hexsz + 6) @@ -2482,7 +2483,8 @@ static void parse_from_existing(struct branch *b) unsigned long size; char *buf; - buf = read_object_with_reference(&b->oid, commit_type, &size, + buf = read_object_with_reference(the_repository, + &b->oid, commit_type, &size, &b->oid); parse_from_commit(b, buf, size); free(buf); @@ -2560,7 +2562,8 @@ static struct hash_list *parse_merge(unsigned int *count) oidcpy(&n->oid, &oe->idx.oid); } else if (!get_oid(from, &n->oid)) { unsigned long size; - char *buf = read_object_with_reference(&n->oid, + char *buf = read_object_with_reference(the_repository, + &n->oid, commit_type, &size, &n->oid); if (!buf || size < the_hash_algo->hexsz + 6)