Merge branch 'bc/object-id'

diff --git a/blob.c b/blob.c
index 1fcb8e44b00f3b9eedbe92da8abe47c2bebca7c7..fa2ab4f7a74e501366e1d3ceca9285ae60606165 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -3,11 +3,11 @@
 
 const char *blob_type = "blob";
 
-struct blob *lookup_blob(const unsigned char *sha1)
+struct blob *lookup_blob(const struct object_id *oid)
 {
-       struct object *obj = lookup_object(sha1);
+       struct object *obj = lookup_object(oid->hash);
        if (!obj)
-               return create_object(sha1, alloc_blob_node());
+               return create_object(oid->hash, alloc_blob_node());
        return object_as_type(obj, OBJ_BLOB, 0);
 }