refs: add methods to init refs db

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>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/init-db.c b/builtin/init-db.c
index b2d8d40a6750e5794dd9bfbfbcb31924a7eec4ba..082fa9f3caa7078f8a0f40fddc0dc21c4d66549f 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -180,13 +180,7 @@ static int create_default_files(const char *template_path)
        char junk[2];
        int reinit;
        int filemode;
        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);
 
        /* Just look for `init.templatedir` */
        git_config(git_init_db_config, NULL);


@@ -210,11 +204,18 @@ static int create_default_files(const char *template_path)
         */
        if (get_shared_repository()) {
                adjust_shared_perm(get_git_dir());
         */
        if (get_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);
+       adjust_shared_perm(git_path("refs"));
+
+       if (refs_init_db(&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.
        /*
         * 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 f26601dc0ce78b9e694ea519bc653f08ea3c6b81..3b0a658c5618dfbcdfd86eab93f6f93d7269ac06 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1292,6 +1292,14 @@ static const char *resolve_ref_recursively(struct ref_store *refs,
        return NULL;
 }
 
        return NULL;
 }
 

+/* backend functions */
+int refs_init_db(struct strbuf *err)
+{
+       struct ref_store *refs = get_ref_store(NULL);
+
+       return refs->be->init_db(refs, err);
+}
+

 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
                               unsigned char *sha1, int *flags)
 {
 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
                               unsigned char *sha1, int *flags)
 {

diff --git a/refs.h b/refs.h
index 132dcef5afa3de3e6e17d259d1d5c9e995041b84..20fae94d7da3324ca2be5d065c0752b0cee3067c 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -66,6 +66,8 @@ int ref_exists(const char *refname);
 
 int is_branch(const char *refname);
 
 
 int is_branch(const char *refname);
 

+extern int refs_init_db(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,
 /*
  * 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 33ec5303845656fea156ba9f9dd7f8c158900289..40e789611c0be3503622ee9bdb3afde52a1e429c 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -4058,10 +4058,28 @@ static int files_reflog_expire(struct ref_store *ref_store,
        return -1;
 }
 
        return -1;
 }
 

+static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
+{
+       /* Check validity (but we don't need the result): */
+       files_downcast(ref_store, 0, "init_db");
+
+       /*
+        * Create .git/refs/{heads,tags}
+        */
+       safe_create_dir(git_path("refs/heads"), 1);
+       safe_create_dir(git_path("refs/tags"), 1);
+       if (get_shared_repository()) {
+               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_ref_store_create,
 struct ref_storage_be refs_be_files = {
        NULL,
        "files",
        files_ref_store_create,

+       files_init_db,

        files_transaction_commit,
        files_initial_transaction_commit,
 
        files_transaction_commit,
        files_initial_transaction_commit,
 

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index ade65010d404b6ec868c99c908d6a4fd3199da84..b3a20955c3ac60b15eca0149e5ad5264cb837c4e 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -479,6 +479,8 @@ struct ref_store;
  */
 typedef struct ref_store *ref_store_init_fn(const char *submodule);
 
  */
 typedef struct ref_store *ref_store_init_fn(const char *submodule);
 

+typedef int ref_init_db_fn(struct ref_store *refs, struct strbuf *err);
+

 typedef int ref_transaction_commit_fn(struct ref_store *refs,
                                      struct ref_transaction *transaction,
                                      struct strbuf *err);
 typedef int ref_transaction_commit_fn(struct ref_store *refs,
                                      struct ref_transaction *transaction,
                                      struct strbuf *err);


@@ -583,6 +585,7 @@ struct ref_storage_be {
        struct ref_storage_be *next;
        const char *name;
        ref_store_init_fn *init;
        struct ref_storage_be *next;
        const char *name;
        ref_store_init_fn *init;

+       ref_init_db_fn *init_db;

        ref_transaction_commit_fn *transaction_commit;
        ref_transaction_commit_fn *initial_transaction_commit;
 
        ref_transaction_commit_fn *transaction_commit;
        ref_transaction_commit_fn *initial_transaction_commit;