Merge branch 'sb/config-write-fix'

diff --git a/blob.c b/blob.c
index 458dafa811edf74e01e10777cf580c696bf0b1a8..342bdbb1bbea78dced090b815cab5ff9bfed9cd9 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -5,13 +5,13 @@
 
 const char *blob_type = "blob";
 
-struct blob *lookup_blob(const struct object_id *oid)
+struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
 {
-       struct object *obj = lookup_object(oid->hash);
+       struct object *obj = lookup_object(r, oid->hash);
        if (!obj)
-               return create_object(the_repository, oid->hash,
-                                    alloc_blob_node(the_repository));
-       return object_as_type(obj, OBJ_BLOB, 0);
+               return create_object(r, oid->hash,
+                                    alloc_blob_node(r));
+       return object_as_type(r, obj, OBJ_BLOB, 0);
 }
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)