Merge branch 'ps/refs-without-the-repository-updates'
Further clean-up the refs subsystem to stop relying on the_repository, and instead use the repository associated to the ref_store object. * ps/refs-without-the-repository-updates: refs/packed: remove references to `the_hash_algo` refs/files: remove references to `the_hash_algo` refs/files: use correct repository refs: remove `dwim_log()` refs: drop `git_default_branch_name()` refs: pass repo when peeling objects refs: move object peeling into "object.c" refs: pass ref store when detecting dangling symrefs refs: convert iteration over replace refs to accept ref store refs: retrieve worktree ref stores via associated repository refs: refactor `resolve_gitlink_ref()` to accept a repository refs: pass repo when retrieving submodule ref store refs: track ref stores via strmap refs: implement releasing ref storages refs: rename `init_db` callback to avoid confusion refs: adjust names for `init` and `init_db` callbacks
This commit is contained in:
7
setup.c
7
setup.c
@ -2099,10 +2099,11 @@ void create_reference_database(unsigned int ref_storage_format,
|
||||
const char *initial_branch, int quiet)
|
||||
{
|
||||
struct strbuf err = STRBUF_INIT;
|
||||
char *to_free = NULL;
|
||||
int reinit = is_reinit();
|
||||
|
||||
repo_set_ref_storage_format(the_repository, ref_storage_format);
|
||||
if (refs_init_db(get_main_ref_store(the_repository), 0, &err))
|
||||
if (ref_store_create_on_disk(get_main_ref_store(the_repository), 0, &err))
|
||||
die("failed to set up refs db: %s", err.buf);
|
||||
|
||||
/*
|
||||
@ -2113,7 +2114,8 @@ void create_reference_database(unsigned int ref_storage_format,
|
||||
char *ref;
|
||||
|
||||
if (!initial_branch)
|
||||
initial_branch = git_default_branch_name(quiet);
|
||||
initial_branch = to_free =
|
||||
repo_default_branch_name(the_repository, quiet);
|
||||
|
||||
ref = xstrfmt("refs/heads/%s", initial_branch);
|
||||
if (check_refname_format(ref, 0) < 0)
|
||||
@ -2130,6 +2132,7 @@ void create_reference_database(unsigned int ref_storage_format,
|
||||
initial_branch);
|
||||
|
||||
strbuf_release(&err);
|
||||
free(to_free);
|
||||
}
|
||||
|
||||
static int create_default_files(const char *template_path,
|
||||
|
Reference in New Issue
Block a user