Merge branch 'jk/loose-object-cache'
Code clean-up with optimization for the codepath that checks (non-)existence of loose objects. * jk/loose-object-cache: odb_load_loose_cache: fix strbuf leak fetch-pack: drop custom loose object cache sha1-file: use loose object cache for quick existence check object-store: provide helpers for loose_objects_cache sha1-file: use an object_directory for the main object dir handle alternates paths the same as the main object dir sha1_file_name(): overwrite buffer instead of appending rename "alternate_object_database" to "object_directory" submodule--helper: prefer strip_suffix() to ends_with() fsck: do not reuse child_process structs
This commit is contained in:
@ -274,9 +274,9 @@ const char *get_git_work_tree(void)
|
||||
|
||||
char *get_object_directory(void)
|
||||
{
|
||||
if (!the_repository->objects->objectdir)
|
||||
if (!the_repository->objects->odb)
|
||||
BUG("git environment hasn't been setup");
|
||||
return the_repository->objects->objectdir;
|
||||
return the_repository->objects->odb->path;
|
||||
}
|
||||
|
||||
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)
|
||||
|
Reference in New Issue
Block a user