Make "read-tree" know how to do a "1-way merge".
[alt-git.git] / blob.c
blob35031af62bbcf61a59edf22f3502ec62e3bb2765
1 #include "blob.h"
2 #include "cache.h"
3 #include <stdlib.h>
5 const char *blob_type = "blob";
7 struct blob *lookup_blob(unsigned char *sha1)
9 struct object *obj = lookup_object(sha1);
10 if (!obj) {
11 struct blob *ret = malloc(sizeof(struct blob));
12 memset(ret, 0, sizeof(struct blob));
13 created_object(sha1, &ret->object);
14 ret->object.type = blob_type;
15 ret->object.parsed = 1;
16 return ret;
18 if (obj->parsed && obj->type != blob_type) {
19 error("Object %s is a %s, not a blob",
20 sha1_to_hex(sha1), obj->type);
21 return NULL;
23 return (struct blob *) obj;