Merge branch 'jk/xdiff-drop-xdl-fast-hash'

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 8069cd2e6263762cf947e70964c936b0f2c586e8..2399b97d902668a08c3c881d544f4d6a88f4e263 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -22,7 +22,6 @@
 static int init_is_bare_repository = 0;
 static int init_shared_repository = -1;
 static const char *init_db_template_dir;
-static const char *git_link;
 
 static void copy_templates_1(struct strbuf *path, struct strbuf *template,
                             DIR *dir)
@@ -181,13 +180,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);
@@ -220,11 +213,18 @@ static int create_default_files(const char *template_path,
         */
        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.
@@ -312,7 +312,7 @@ static void create_object_directory(void)
        strbuf_release(&path);
 }
 
-static void separate_git_dir(const char *git_dir)
+static void separate_git_dir(const char *git_dir, const char *git_link)
 {
        struct stat st;
 
@@ -349,22 +349,15 @@ int init_db(const char *git_dir, const char *real_git_dir,
                if (!exist_ok && !stat(real_git_dir, &st))
                        die(_("%s already exists"), real_git_dir);
 
-               /*
-                * make sure symlinks are resolved because we'll be
-                * moving the target repo later on in separate_git_dir()
-                */
-               git_link = xstrdup(real_path(git_dir));
                set_git_dir(real_path(real_git_dir));
+               git_dir = get_git_dir();
+               separate_git_dir(git_dir, original_git_dir);
        }
        else {
                set_git_dir(real_path(git_dir));
-               git_link = NULL;
+               git_dir = get_git_dir();
        }
        startup_info->have_repository = 1;
-       git_dir = get_git_dir();
-
-       if (git_link)
-               separate_git_dir(git_dir);
 
        safe_create_dir(git_dir, 0);
 
@@ -405,13 +398,16 @@ int init_db(const char *git_dir, const char *real_git_dir,
        if (!(flags & INIT_DB_QUIET)) {
                int len = strlen(git_dir);
 
-               /* TRANSLATORS: The first '%s' is either "Reinitialized
-                  existing" or "Initialized empty", the second " shared" or
-                  "", and the last '%s%s' is the verbatim directory name. */
-               printf(_("%s%s Git repository in %s%s\n"),
-                      reinit ? _("Reinitialized existing") : _("Initialized empty"),
-                      get_shared_repository() ? _(" shared") : "",
-                      git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+               if (reinit)
+                       printf(get_shared_repository()
+                              ? _("Reinitialized existing shared Git repository in %s%s\n")
+                              : _("Reinitialized existing Git repository in %s%s\n"),
+                              git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+               else
+                       printf(get_shared_repository()
+                              ? _("Initialized empty shared Git repository in %s%s\n")
+                              : _("Initialized empty Git repository in %s%s\n"),
+                              git_dir, len && git_dir[len-1] != '/' ? "/" : "");
        }
 
        free(original_git_dir);