git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, peff@peff.net, mhagger@alum.mit.edu,
	pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v7 14/33] refs: add methods to init refs db
Date: Mon, 29 Feb 2016 19:52:47 -0500	[thread overview]
Message-ID: <1456793586-22082-15-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456793586-22082-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>
Signed-off-by: Junio C Hamano <gitster@pobox.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 6223b7d..e6d4e86 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 d25eee2..b2697f6 100644
--- a/refs.c
+++ b/refs.c
@@ -1319,6 +1319,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 3405842..13ce2a0 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 35328d2..acb4401 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3415,9 +3415,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

  parent reply	other threads:[~2016-03-01  0:53 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-01  0:52 [PATCH v7 00/33] refs backend David Turner
2016-03-01  0:52 ` [PATCH v7 01/33] setup: call setup_git_directory_gently before accessing refs David Turner
2016-03-01  8:35   ` Jeff King
2016-03-01 23:47     ` David Turner
2016-03-02  0:33       ` David Turner
2016-03-02  2:45       ` Jeff King
2016-03-01  0:52 ` [PATCH v7 02/33] refs: move head_ref{,_submodule} to the common code David Turner
2016-03-01  0:52 ` [PATCH v7 03/33] refs: move for_each_*ref* functions into " David Turner
2016-03-01  0:52 ` [PATCH v7 04/33] files-backend: break out ref reading David Turner
2016-03-20  5:03   ` Michael Haggerty
2016-03-22  8:33     ` Michael Haggerty
2016-03-23 10:19   ` Michael Haggerty
2016-03-01  0:52 ` [PATCH v7 05/33] refs: move resolve_ref_unsafe into common code David Turner
2016-03-01  0:52 ` [PATCH v7 06/33] refs: add a backend method structure with transaction functions David Turner
2016-03-01  0:52 ` [PATCH v7 07/33] refs: add methods for misc ref operations David Turner
2016-03-01  0:52 ` [PATCH v7 08/33] refs: add method for do_for_each_ref David Turner
2016-03-01  0:52 ` [PATCH v7 09/33] refs: reduce the visibility of do_for_each_ref() David Turner
2016-03-24  7:07   ` Michael Haggerty
2016-03-24 18:56     ` David Turner
2016-03-01  0:52 ` [PATCH v7 10/33] refs: add do_for_each_per_worktree_ref David Turner
2016-03-01  0:52 ` [PATCH v7 11/33] refs: add methods for reflog David Turner
2016-03-01  0:52 ` [PATCH v7 12/33] refs: add method for initial ref transaction commit David Turner
2016-03-01  0:52 ` [PATCH v7 13/33] refs: add method for delete_refs David Turner
2016-03-01  0:52 ` David Turner [this message]
2016-03-24  7:28   ` [PATCH v7 14/33] refs: add methods to init refs db Michael Haggerty
2016-03-24 18:04     ` David Turner
2016-03-01  0:52 ` [PATCH v7 15/33] refs: add method to rename refs David Turner
2016-03-01  0:52 ` [PATCH v7 16/33] refs: handle non-normal ref renames David Turner
2016-03-01  0:52 ` [PATCH v7 17/33] refs: make lock generic David Turner
2016-03-24 19:45   ` Michael Haggerty
2016-03-01  0:52 ` [PATCH v7 18/33] refs: move duplicate check to common code David Turner
2016-03-01  0:52 ` [PATCH v7 19/33] refs: allow log-only updates David Turner
2016-04-21 14:17   ` Michael Haggerty
2016-04-25 16:46     ` David Turner
2016-03-01  0:52 ` [PATCH v7 20/33] refs: don't dereference on rename David Turner
2016-03-01  0:52 ` [PATCH v7 21/33] refs: on symref reflog expire, lock symref not referrent David Turner
2016-03-01  0:52 ` [PATCH v7 22/33] refs: resolve symbolic refs first David Turner
2016-03-01  0:52 ` [PATCH v7 23/33] refs: always handle non-normal refs in files backend David Turner
2016-03-01  0:52 ` [PATCH v7 24/33] init: allow alternate ref strorage to be set for new repos David Turner
2016-03-01  0:52 ` [PATCH v7 25/33] refs: check submodules' ref storage config David Turner
2016-03-01  0:52 ` [PATCH v7 26/33] clone: allow ref storage backend to be set for clone David Turner
2016-03-01  0:53 ` [PATCH v7 27/33] svn: learn ref-storage argument David Turner
2016-03-01  0:53 ` [PATCH v7 28/33] refs: register ref storage backends David Turner
2016-03-01  0:53 ` [PATCH v7 29/33] setup: configure ref storage on setup David Turner
2016-03-01  8:48   ` Jeff King
2016-03-01 14:50     ` Jeff King
2016-03-01 17:18   ` Ramsay Jones
2016-03-01 19:16     ` David Turner
2016-03-01  0:53 ` [PATCH v7 30/33] refs: break out resolve_ref_unsafe_submodule David Turner
2016-03-01 17:21   ` Ramsay Jones
2016-03-01 19:17     ` David Turner
2016-03-01  0:53 ` [PATCH v7 31/33] refs: add LMDB refs storage backend David Turner
2016-03-01  1:31   ` Duy Nguyen
2016-03-01  1:35     ` David Turner
2016-03-01  1:45       ` Duy Nguyen
2016-03-01  0:53 ` [PATCH v7 32/33] refs: tests for lmdb backend David Turner
2016-03-01  0:53 ` [PATCH v7 33/33] tests: add ref-storage argument David Turner

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=1456793586-22082-15-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    /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).