merge-ort: ensure we consult df_conflict and path_conflicts
[git.git] / blob.c
blob182718aba9fe320f1064a12fb5baf1969f563b29
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(struct repository *r, const struct object_id *oid)
10 struct object *obj = lookup_object(r, oid);
11 if (!obj)
12 return create_object(r, oid, alloc_blob_node(r));
13 return object_as_type(obj, OBJ_BLOB, 0);
16 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
18 item->object.parsed = 1;
19 return 0;