mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'ps/object-store'
Code clean-up around object access API.
* ps/object-store:
odb: rename `read_object_with_reference()`
odb: rename `pretend_object_file()`
odb: rename `has_object()`
odb: rename `repo_read_object_file()`
odb: rename `oid_object_info()`
odb: trivial refactorings to get rid of `the_repository`
odb: get rid of `the_repository` when handling submodule sources
odb: get rid of `the_repository` when handling the primary source
odb: get rid of `the_repository` in `for_each()` functions
odb: get rid of `the_repository` when handling alternates
odb: get rid of `the_repository` in `odb_mkstemp()`
odb: get rid of `the_repository` in `assert_oid_type()`
odb: get rid of `the_repository` in `find_odb()`
odb: introduce parent pointers
object-store: rename files to "odb.{c,h}"
object-store: rename `object_directory` to `odb_source`
object-store: rename `raw_object_store` to `object_database`
This commit is contained in:
4
config.c
4
config.c
@@ -31,7 +31,7 @@
|
||||
#include "hashmap.h"
|
||||
#include "string-list.h"
|
||||
#include "object-name.h"
|
||||
#include "object-store.h"
|
||||
#include "odb.h"
|
||||
#include "pager.h"
|
||||
#include "path.h"
|
||||
#include "utf8.h"
|
||||
@@ -1937,7 +1937,7 @@ int git_config_from_blob_oid(config_fn_t fn,
|
||||
unsigned long size;
|
||||
int ret;
|
||||
|
||||
buf = repo_read_object_file(repo, oid, &type, &size);
|
||||
buf = odb_read_object(repo->objects, oid, &type, &size);
|
||||
if (!buf)
|
||||
return error(_("unable to load config blob object '%s'"), name);
|
||||
if (type != OBJ_BLOB) {
|
||||
|
||||
Reference in New Issue
Block a user