refs: centralize initialization of the base ref_store.

hanwen · gitster · commit f9f7fd3b238c · 2021-12-22T13:51:38.000-08:00
Signed-off-by: Han-Wen Nienhuys &lt;hanwen@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -2007,10 +2007,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
 	return refs;
 }
 
-void base_ref_store_init(struct ref_store *refs,
-			 const struct ref_storage_be *be)
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+			 const char *path, const struct ref_storage_be *be)
 {
 	refs->be = be;
+	refs->repo = repo;
+	refs->gitdir = xstrdup(path);
 }
 
 /* backend functions */
diff --git a/refs/debug.c b/refs/debug.c
@@ -26,7 +26,8 @@ struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_stor
 	be_copy->name = store->be->name;
 	trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir);
 	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;
 }
 
diff --git a/refs/files-backend.c b/refs/files-backend.c
@@ -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 strbuf sb = STRBUF_INIT;
 
-	ref_store->repo = repo;
-	ref_store->gitdir = xstrdup(gitdir);
-	base_ref_store_init(ref_store, &refs_be_files);
+	base_ref_store_init(ref_store, repo, gitdir, &refs_be_files);
 	refs->store_flags = flags;
-
 	get_common_dir_noenv(&sb, gitdir);
 	refs->gitcommondir = strbuf_detach(&sb, NULL);
 	refs->packed_ref_store =
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
@@ -201,13 +201,11 @@ struct ref_store *packed_ref_store_create(struct repository *repo,
 	struct ref_store *ref_store = (struct ref_store *)refs;
 	struct strbuf sb = STRBUF_INIT;
 
-	base_ref_store_init(ref_store, &refs_be_packed);
-	ref_store->repo = repo;
-	ref_store->gitdir = xstrdup(gitdir);
+	base_ref_store_init(ref_store, repo, gitdir, &refs_be_packed);
 	refs->store_flags = store_flags;
+
 	strbuf_addf(&sb, "%s/packed-refs", gitdir);
 	refs->path = strbuf_detach(&sb, NULL);
-
 	chdir_notify_reparent("packed-refs", &refs->path);
 	return ref_store;
 }
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
@@ -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
  * reference stores.
  */
-void base_ref_store_init(struct ref_store *refs,
-			 const struct ref_storage_be *be);
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+			 const char *path, const struct ref_storage_be *be);
 
 /*
  * Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance.

Original file line number	Diff line number	Diff line change
`@@ -2007,10 +2007,12 @@ struct ref_store get_worktree_ref_store(const struct worktree wt)`
`2007`	`2007`	`return refs;`
`2008`	`2008`	`}`
`2009`	`2009`
`2010`		`-void base_ref_store_init(struct ref_store *refs,`
`2011`		`- const struct ref_storage_be *be)`
	`2010`	`+void base_ref_store_init(struct ref_store refs, struct repository repo,`
	`2011`	`+ const char path, const struct ref_storage_be be)`
`2012`	`2012`	`{`
`2013`	`2013`	`refs->be = be;`
	`2014`	`+ refs->repo = repo;`
	`2015`	`+ refs->gitdir = xstrdup(path);`
`2014`	`2016`	`}`
`2015`	`2017`
`2016`	`2018`	`/* backend functions */`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ struct ref_store maybe_debug_wrap_ref_store(const char gitdir, struct ref_stor`
`26`	`26`	`be_copy->name = store->be->name;`
`27`	`27`	`trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir);`
`28`	`28`	`res->refs = store;`
`29`		`- base_ref_store_init((struct ref_store *)res, be_copy);`
	`29`	`+ base_ref_store_init((struct ref_store *)res, store->repo, gitdir,`
	`30`	`+ be_copy);`
`30`	`31`	`return (struct ref_store *)res;`
`31`	`32`	`}`
`32`	`33`