development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 14:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refs: centralize initialization of the base ref_store.

Browse source 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Han-Wen Nienhuys 2021-12-22 18:11:54 +00:00 committed by Junio C Hamano
parent a6db572af6
commit f9f7fd3b23
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
refs.c
View file

@ -2007,10 +2007,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
return refs; return refs;
} }
void base_ref_store_init(struct ref_store *refs, void base_ref_store_init(struct ref_store *refs, struct repository *repo,
const struct ref_storage_be *be) const char *path, const struct ref_storage_be *be)
{ {
refs->be = be; refs->be = be;
refs->repo = repo;
refs->gitdir = xstrdup(path);
} }
/* backend functions */ /* backend functions */

3
refs/debug.c
View file

@ -26,7 +26,8 @@ struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_stor
be_copy->name = store->be->name; be_copy->name = store->be->name;
trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir); trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir);
res->refs = store; res->refs = store;
base_ref_store_init((struct ref_store *)res, be_copy); base_ref_store_init((struct ref_store *)res, store->repo, gitdir,
be_copy);
return (struct ref_store *)res; return (struct ref_store *)res;
} }

5
refs/files-backend.c
View file

@ -86,11 +86,8 @@ static struct ref_store *files_ref_store_create(struct repository *repo,
struct ref_store *ref_store = (struct ref_store *)refs; struct ref_store *ref_store = (struct ref_store *)refs;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
ref_store->repo = repo; base_ref_store_init(ref_store, repo, gitdir, &refs_be_files);
ref_store->gitdir = xstrdup(gitdir);
base_ref_store_init(ref_store, &refs_be_files);
refs->store_flags = flags; refs->store_flags = flags;
get_common_dir_noenv(&sb, gitdir); get_common_dir_noenv(&sb, gitdir);
refs->gitcommondir = strbuf_detach(&sb, NULL); refs->gitcommondir = strbuf_detach(&sb, NULL);
refs->packed_ref_store = refs->packed_ref_store =

6
refs/packed-backend.c
View file

@ -201,13 +201,11 @@ struct ref_store *packed_ref_store_create(struct repository *repo,
struct ref_store *ref_store = (struct ref_store *)refs; struct ref_store *ref_store = (struct ref_store *)refs;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
base_ref_store_init(ref_store, &refs_be_packed); base_ref_store_init(ref_store, repo, gitdir, &refs_be_packed);
ref_store->repo = repo;
ref_store->gitdir = xstrdup(gitdir);
refs->store_flags = store_flags; refs->store_flags = store_flags;
strbuf_addf(&sb, "%s/packed-refs", gitdir); strbuf_addf(&sb, "%s/packed-refs", gitdir);
refs->path = strbuf_detach(&sb, NULL); refs->path = strbuf_detach(&sb, NULL);
chdir_notify_reparent("packed-refs", &refs->path); chdir_notify_reparent("packed-refs", &refs->path);
return ref_store; return ref_store;
} }

4
refs/refs-internal.h
View file

@ -710,8 +710,8 @@ int parse_loose_ref_contents(const char *buf, struct object_id *oid,
* Fill in the generic part of refs and add it to our collection of * Fill in the generic part of refs and add it to our collection of
* reference stores. * reference stores.
*/ */
void base_ref_store_init(struct ref_store *refs, void base_ref_store_init(struct ref_store *refs, struct repository *repo,
const struct ref_storage_be *be); const char *path, const struct ref_storage_be *be);
/* /*
* Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance. * Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance.