[PATCH 08/16] refs: add methods to init refs backend and db
From: David Turner <hidden>
Date: 2016-06-15 23:07:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Alternate refs backends might not need the refs/heads directory and so on, so we make ref db initialization part of the backend. We also might need to initialize ref backends themselves, so we'll add a method for that as well. Signed-off-by: David Turner <redacted> --- builtin/init-db.c | 14 ++++---------- refs.c | 8 +++++++- refs.h | 4 +++- refs/files-backend.c | 23 +++++++++++++++++++++++ refs/refs-internal.h | 4 ++++ 5 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 26e1cc3..4771e7e 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c@@ -178,13 +178,7 @@ static int create_default_files(const char *template_path) char junk[2]; int reinit; int filemode; - - /* - * Create .git/refs/{heads,tags} - */ - safe_create_dir(git_path_buf(&buf, "refs"), 1); - safe_create_dir(git_path_buf(&buf, "refs/heads"), 1); - safe_create_dir(git_path_buf(&buf, "refs/tags"), 1); + struct strbuf err = STRBUF_INIT; /* Just look for `init.templatedir` */ git_config(git_init_db_config, NULL);
@@ -208,11 +202,11 @@ static int create_default_files(const char *template_path) */ if (shared_repository) { adjust_shared_perm(get_git_dir()); - adjust_shared_perm(git_path_buf(&buf, "refs")); - adjust_shared_perm(git_path_buf(&buf, "refs/heads")); - adjust_shared_perm(git_path_buf(&buf, "refs/tags")); } + if (refs_init_db(&err, shared_repository)) + die("failed to set up refs db: %s", err.buf); + /* * Create the default symlink from ".git/HEAD" to the "master" * branch, if it does not exist yet.
diff --git a/refs.c b/refs.c
index 9a2fed7..bdeb276 100644
--- a/refs.c
+++ b/refs.c@@ -22,13 +22,14 @@ struct ref_be *refs_backends = &refs_be_files; /* * This function is used to switch to an alternate backend. */ -int set_refs_backend(const char *name) +int set_refs_backend(const char *name, void *data) { struct ref_be *be; for (be = refs_backends; be; be = be->next) if (!strcmp(be->name, name)) { the_refs_backend = be; + be->init_backend(data); return 0; } return 1;
@@ -1109,6 +1110,11 @@ int rename_ref_available(const char *oldname, const char *newname) } /* backend functions */ +int refs_init_db(struct strbuf *err, int shared) +{ + return the_refs_backend->init_db(err, shared); +} + int ref_transaction_commit(struct ref_transaction *transaction, struct strbuf *err) {
diff --git a/refs.h b/refs.h
index 4e5477d..c211b9e 100644
--- a/refs.h
+++ b/refs.h@@ -66,6 +66,8 @@ extern int ref_exists(const char *refname); extern int is_branch(const char *refname); +extern int refs_init_db(struct strbuf *err, int shared); + /* * If refname is a non-symbolic reference that refers to a tag object, * and the tag can be (recursively) dereferenced to a non-tag object,
@@ -508,6 +510,6 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1, reflog_expiry_cleanup_fn cleanup_fn, void *policy_cb_data); -int set_refs_backend(const char *name); +int set_refs_backend(const char *name, void *data); #endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index e769242..6600c02 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c@@ -3313,6 +3313,11 @@ static int ref_present(const char *refname, return string_list_has_string(affected_refnames, refname); } +void files_init_backend(void *data) +{ + /* do nothing */ +} + static int files_initial_transaction_commit(struct ref_transaction *transaction, struct strbuf *err) {
@@ -3534,9 +3539,27 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1, return -1; } +static int files_init_db(struct strbuf *err, int shared) +{ + /* + * Create .git/refs/{heads,tags} + */ + safe_create_dir(git_path("refs"), 1); + safe_create_dir(git_path("refs/heads"), 1); + safe_create_dir(git_path("refs/tags"), 1); + if (shared) { + adjust_shared_perm(git_path("refs")); + adjust_shared_perm(git_path("refs/heads")); + adjust_shared_perm(git_path("refs/tags")); + } + return 0; +} + struct ref_be refs_be_files = { NULL, "files", + files_init_backend, + files_init_db, files_transaction_commit, files_initial_transaction_commit,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 478ad54..85a0b91 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h@@ -208,6 +208,8 @@ const char *find_descendant_ref(const char *dirname, int rename_ref_available(const char *oldname, const char *newname); /* refs backends */ +typedef void ref_backend_init_fn(void *data); +typedef int ref_backend_init_db_fn(struct strbuf *err, int shared); typedef int ref_transaction_commit_fn(struct ref_transaction *transaction, struct strbuf *err);
@@ -267,6 +269,8 @@ typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data); struct ref_be { struct ref_be *next; const char *name; + ref_backend_init_fn *init_backend; + ref_backend_init_db_fn *init_db; ref_transaction_commit_fn *transaction_commit; ref_transaction_commit_fn *initial_transaction_commit;
--
2.4.2.749.g0ed01d8-twtrsrc