Merge gitk to pick up emergency build fix

diff --git a/blob.c b/blob.c
index 342bdbb1bbea78dced090b815cab5ff9bfed9cd9..36f9abda19ec1095a903aa138bdf53ce18a86b10 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -7,10 +7,9 @@ const char *blob_type = "blob";
 
 struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
 {
-       struct object *obj = lookup_object(r, oid->hash);
+       struct object *obj = lookup_object(r, oid);
        if (!obj)
-               return create_object(r, oid->hash,
-                                    alloc_blob_node(r));
+               return create_object(r, oid, alloc_blob_node(r));
        return object_as_type(r, obj, OBJ_BLOB, 0);
 }