odb: introduce odb_write_object()
We do not have a backend-agnostic way to write objects into an object database. While there is `write_object_file()`, this function is rather specific to the loose object format. Introduce `odb_write_object()` to plug this gap. For now, this function is a simple wrapper around `write_object_file()` and doesn't even use the passed-in object database yet. This will change in subsequent commits, where `write_object_file()` is converted so that it works on top of an `odb_source`. `odb_write_object()` will then become responsible for deciding which source an object shall be written to. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
0f9b189357
commit
ab1c6e1d12
@@ -155,7 +155,8 @@ int cmd_merge_file(int argc,
|
||||
if (object_id && !to_stdout) {
|
||||
struct object_id oid;
|
||||
if (result.size) {
|
||||
if (write_object_file(result.ptr, result.size, OBJ_BLOB, &oid) < 0)
|
||||
if (odb_write_object(the_repository->objects, result.ptr,
|
||||
result.size, OBJ_BLOB, &oid) < 0)
|
||||
ret = error(_("Could not write object file"));
|
||||
} else {
|
||||
oidcpy(&oid, the_hash_algo->empty_blob);
|
||||
|
||||
Reference in New Issue
Block a user