From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v6 13/32] refs: add methods to init refs db
Date: Wed, 24 Feb 2016 17:58:45 -0500 [thread overview]
Message-ID: <1456354744-8022-14-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456354744-8022-1-git-send-email-dturner@twopensource.com>
Alternate refs backends might not need the refs/heads directory and so
on, so we make ref db initialization part of the backend.
Signed-off-by: David Turner <dturner@twopensource.com>
---
builtin/init-db.c | 20 ++++++++++----------
refs.c | 5 +++++
refs.h | 2 ++
refs/files-backend.c | 16 ++++++++++++++++
refs/refs-internal.h | 2 ++
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 07229d6..0c8f4ac 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -177,13 +177,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);
@@ -207,12 +201,18 @@ 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"));
}
/*
+ * We need to create a "refs" dir in any case so that older
+ * versions of git can tell that this is a repository.
+ */
+ safe_create_dir(git_path("refs"), 1);
+
+ if (refs_init_db(shared_repository, &err))
+ 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 21b103c..baf83ac 100644
--- a/refs.c
+++ b/refs.c
@@ -1316,6 +1316,11 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
}
/* backend functions */
+int refs_init_db(int shared, struct strbuf *err)
+{
+ return the_refs_backend->init_db(shared, err);
+}
+
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
diff --git a/refs.h b/refs.h
index 5bc3fbc..feff82e 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(int shared, struct strbuf *err);
+
/*
* 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,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 6b15a2e..67ba4c2 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3424,9 +3424,25 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,
return -1;
}
+static int files_init_db(int shared, struct strbuf *err)
+{
+ /*
+ * Create .git/refs/{heads,tags}
+ */
+ 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_storage_be refs_be_files = {
NULL,
"files",
+ files_init_db,
files_transaction_commit,
files_initial_transaction_commit,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index beef457..dfd0326 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -211,6 +211,7 @@ int do_for_each_per_worktree_ref(const char *submodule, const char *base,
void *cb_data);
/* refs backends */
+typedef int ref_init_db_fn(int shared, struct strbuf *err);
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
@@ -255,6 +256,7 @@ typedef int do_for_each_ref_fn(const char *submodule, const char *base,
struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
+ ref_init_db_fn *init_db;
ref_transaction_commit_fn *transaction_commit;
ref_transaction_commit_fn *initial_transaction_commit;
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-02-24 22:59 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 22:58 [PATCH v6 00/32] refs backend David Turner
2016-02-24 22:58 ` [PATCH v6 01/32] refs: move head_ref{,_submodule} to the common code David Turner
2016-02-24 22:58 ` [PATCH v6 02/32] refs: move for_each_*ref* functions into " David Turner
2016-02-24 22:58 ` [PATCH v6 03/32] files-backend: break out ref reading David Turner
2016-02-25 0:21 ` Junio C Hamano
2016-02-25 0:51 ` Junio C Hamano
2016-02-25 20:11 ` David Turner
2016-02-25 20:27 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 04/32] refs: move resolve_ref_unsafe into common code David Turner
2016-02-25 0:22 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 05/32] refs: add a backend method structure with transaction functions David Turner
2016-02-27 4:06 ` Jeff King
2016-02-29 20:43 ` David Turner
2016-02-24 22:58 ` [PATCH v6 06/32] refs: add methods for misc ref operations David Turner
2016-02-24 22:58 ` [PATCH v6 07/32] refs: add method for do_for_each_ref David Turner
2016-02-24 22:58 ` [PATCH v6 08/32] refs: reduce the visibility of do_for_each_ref() David Turner
2016-02-24 22:58 ` [PATCH v6 09/32] refs: add do_for_each_per_worktree_ref David Turner
2016-02-24 22:58 ` [PATCH v6 10/32] refs: add methods for reflog David Turner
2016-02-24 22:58 ` [PATCH v6 11/32] refs: add method for initial ref transaction commit David Turner
2016-02-24 22:58 ` [PATCH v6 12/32] refs: add method for delete_refs David Turner
2016-02-24 22:58 ` David Turner [this message]
2016-02-24 22:58 ` [PATCH v6 14/32] refs: add method to rename refs David Turner
2016-02-24 22:58 ` [PATCH v6 15/32] refs: handle non-normal ref renames David Turner
2016-02-24 22:58 ` [PATCH v6 16/32] refs: make lock generic David Turner
2016-02-24 22:58 ` [PATCH v6 17/32] refs: move duplicate check to common code David Turner
2016-02-24 22:58 ` [PATCH v6 18/32] refs: allow log-only updates David Turner
2016-02-24 22:58 ` [PATCH v6 19/32] refs: don't dereference on rename David Turner
2016-02-24 22:58 ` [PATCH v6 20/32] refs: on symref reflog expire, lock symref not referrent David Turner
2016-02-24 22:58 ` [PATCH v6 21/32] refs: resolve symbolic refs first David Turner
2016-02-24 22:58 ` [PATCH v6 22/32] refs: always handle non-normal refs in files backend David Turner
2016-02-24 22:58 ` [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-24 22:58 ` [PATCH v6 24/32] refs: check submodules' ref storage config David Turner
2016-02-24 22:58 ` [PATCH v6 25/32] clone: allow ref storage backend to be set for clone David Turner
2016-02-24 22:58 ` [PATCH v6 26/32] svn: learn ref-storage argument David Turner
2016-02-24 22:58 ` [PATCH v6 27/32] refs: register ref storage backends David Turner
2016-02-24 22:59 ` [PATCH v6 28/32] config: read ref storage config on startup David Turner
2016-02-27 3:56 ` Jeff King
2016-02-27 4:14 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:13 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:10 ` Jeff King
2016-02-29 22:21 ` Jeff King
2016-02-29 22:59 ` David Turner
2016-02-24 22:59 ` [PATCH v6 29/32] refs: break out resolve_ref_unsafe_submodule David Turner
2016-02-24 22:59 ` [PATCH v6 30/32] refs: add LMDB refs storage backend David Turner
2016-02-24 22:59 ` [PATCH v6 31/32] refs: tests for lmdb backend David Turner
2016-02-24 22:59 ` [PATCH v6 32/32] tests: add ref-storage argument David Turner
2016-02-29 22:52 ` SZEDER Gábor
2016-02-29 23:50 ` David Turner
2016-02-25 0:08 ` [PATCH v6 00/32] refs backend Ramsay Jones
2016-02-25 19:32 ` David Turner
2016-02-25 12:57 ` Duy Nguyen
2016-02-25 19:27 ` David Turner
2016-02-25 19:31 ` Stefan Beller
2016-02-25 20:31 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456354744-8022-14-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).