summaryrefslogtreecommitdiff
path: root/blob.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-21 17:41:40 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-21 17:42:02 -0700
commit42c4b58059fa9af65e90f2c418bb551e30d1d32f (patch)
treec6aa1b75909009b249ceb768717c27011b73adb4 /blob.c
parent520635fa3a7781cce412f6b02e165b5d897a99d1 (diff)
parent100c5f3b0b27ec6617de1a785c4ff481e92636c1 (diff)
downloadgit-42c4b58059fa9af65e90f2c418bb551e30d1d32f.tar.gz
Merge branch 'lt/objalloc'
* 'lt/objalloc': Clean up object creation to use more common code Use proper object allocators for unknown object nodes too
Diffstat (limited to 'blob.c')
-rw-r--r--blob.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/blob.c b/blob.c
index 0a9ea417b8..bd7d078e1a 100644
--- a/blob.c
+++ b/blob.c
@@ -6,12 +6,8 @@ const char *blob_type = "blob";
struct blob *lookup_blob(const unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);
- if (!obj) {
- struct blob *ret = alloc_blob_node();
- created_object(sha1, &ret->object);
- ret->object.type = OBJ_BLOB;
- return ret;
- }
+ if (!obj)
+ return create_object(sha1, OBJ_BLOB, alloc_blob_node());
if (!obj->type)
obj->type = OBJ_BLOB;
if (obj->type != OBJ_BLOB) {