Skip to content

Commit

Permalink
blob: allow lookup_blob to handle arbitrary repositories
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
stefanbeller authored and gitster committed Jun 29, 2018
1 parent 94c09a7 commit 17126cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions blob.c
Expand Up @@ -5,13 +5,13 @@

const char *blob_type = "blob";

struct blob *lookup_blob_the_repository(const struct object_id *oid)
struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
{
struct object *obj = lookup_object(the_repository, 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(the_repository, 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)
Expand Down
3 changes: 1 addition & 2 deletions blob.h
Expand Up @@ -9,8 +9,7 @@ struct blob {
struct object object;
};

#define lookup_blob(r, o) lookup_blob_##r(o)
struct blob *lookup_blob_the_repository(const struct object_id *oid);
struct blob *lookup_blob(struct repository *r, const struct object_id *oid);

int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);

Expand Down

0 comments on commit 17126cd

Please sign in to comment.