| 3610 | } |
| 3611 | |
| 3612 | static int resolve_to(struct image *image, const struct object_id *result_id) |
| 3613 | { |
| 3614 | size_t size; |
| 3615 | enum object_type type; |
| 3616 | char *data; |
| 3617 | |
| 3618 | image_clear(image); |
| 3619 | |
| 3620 | data = odb_read_object(the_repository->objects, result_id, &type, &size); |
| 3621 | if (!data || type != OBJ_BLOB) |
| 3622 | die("unable to read blob object %s", oid_to_hex(result_id)); |
| 3623 | strbuf_attach(&image->buf, data, size, size + 1); |
| 3624 | |
| 3625 | return 0; |
| 3626 | } |
| 3627 | |
| 3628 | static int three_way_merge(struct apply_state *state, |
| 3629 | struct image *image, |
no test coverage detected