Merge branch 'ps/object-file-wo-the-repository'
Reduce implicit assumption and dependence on the_repository in the object-file subsystem. * ps/object-file-wo-the-repository: object-file: get rid of `the_repository` in index-related functions object-file: get rid of `the_repository` in `force_object_loose()` object-file: get rid of `the_repository` in `read_loose_object()` object-file: get rid of `the_repository` in loose object iterators object-file: remove declaration for `for_each_file_in_obj_subdir()` object-file: inline `for_each_loose_file_in_objdir_buf()` object-file: get rid of `the_repository` when writing objects odb: introduce `odb_write_object()` loose: write loose objects map via their source object-file: get rid of `the_repository` in `finalize_object_file()` object-file: get rid of `the_repository` in `loose_object_info()` object-file: get rid of `the_repository` when freshening objects object-file: inline `check_and_freshen()` functions object-file: get rid of `the_repository` in `has_loose_object()` object-file: stop using `the_hash_algo` object-file: fix -Wsign-compare warnings
This commit is contained in:
@@ -489,7 +489,8 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (write_object_file(buf.buf, buf.len, OBJ_COMMIT, &new_oid)) {
|
||||
if (odb_write_object(the_repository->objects, buf.buf,
|
||||
buf.len, OBJ_COMMIT, &new_oid)) {
|
||||
strbuf_release(&buf);
|
||||
return error(_("could not write replacement commit for: '%s'"),
|
||||
old_ref);
|
||||
|
||||
Reference in New Issue
Block a user