X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=object.c;h=d8d09f92aacd114e23378af2cfbeb78a3dd785a0;hb=cb8da70547af5cd5c8e03be5a236971951e81277;hp=7e1f2bbed2ad7f331fefc78d759acb14050bea48;hpb=eb4e67288bb9d66fb46092fa30d72c4bdded0c2a;p=git.git diff --git a/object.c b/object.c index 7e1f2bbed..d8d09f92a 100644 --- a/object.c +++ b/object.c @@ -149,6 +149,8 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t struct tree *tree = lookup_tree(sha1); if (tree) { obj = &tree->object; + if (!tree->buffer) + tree->object.parsed = 0; if (!tree->object.parsed) { if (parse_tree_buffer(tree, buffer, size)) return NULL; @@ -188,8 +190,8 @@ struct object *parse_object(const unsigned char *sha1) unsigned long size; enum object_type type; int eaten; - const unsigned char *repl; - void *buffer = read_sha1_file_repl(sha1, &type, &size, &repl); + const unsigned char *repl = lookup_replace_object(sha1); + void *buffer = read_sha1_file(sha1, &type, &size); if (buffer) { struct object *obj;