rerere: recalculate conflict ID when unresolved conflict is committed
[git.git] / blob.c
blob458dafa811edf74e01e10777cf580c696bf0b1a8
1 #include "cache.h"
2 #include "blob.h"
3 #include "repository.h"
4 #include "alloc.h"
6 const char *blob_type = "blob";
8 struct blob *lookup_blob(const struct object_id *oid)
10 struct object *obj = lookup_object(oid->hash);
11 if (!obj)
12 return create_object(the_repository, oid->hash,
13 alloc_blob_node(the_repository));
14 return object_as_type(obj, OBJ_BLOB, 0);
17 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
19 item->object.parsed = 1;
20 return 0;