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:
@@ -33,7 +33,7 @@
|
||||
#include "packfile.h"
|
||||
#include "object-file.h"
|
||||
#include "object-name.h"
|
||||
#include "object-store.h"
|
||||
#include "odb.h"
|
||||
#include "path.h"
|
||||
#include "protocol.h"
|
||||
#include "commit-reach.h"
|
||||
@@ -359,7 +359,8 @@ static void write_head_info(void)
|
||||
|
||||
refs_for_each_fullref_in(get_main_ref_store(the_repository), "",
|
||||
exclude_patterns, show_ref_cb, &seen);
|
||||
for_each_alternate_ref(show_one_alternate_ref, &seen);
|
||||
odb_for_each_alternate_ref(the_repository->objects,
|
||||
show_one_alternate_ref, &seen);
|
||||
|
||||
oidset_clear(&seen);
|
||||
strvec_clear(&excludes_vector);
|
||||
@@ -1508,8 +1509,8 @@ static const char *update(struct command *cmd, struct shallow_info *si)
|
||||
}
|
||||
|
||||
if (!is_null_oid(new_oid) &&
|
||||
!has_object(the_repository, new_oid,
|
||||
HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
|
||||
!odb_has_object(the_repository->objects, new_oid,
|
||||
HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
|
||||
error("unpack should have generated %s, "
|
||||
"but I can't find it!", oid_to_hex(new_oid));
|
||||
ret = "bad pack";
|
||||
|
||||
Reference in New Issue
Block a user