Fix git-fetch-script breakage

diff --git a/init-db.c b/init-db.c
index bfbe1eb1b6a3daa6e462046338a62c954ace1717..c78c4951144e04d97773a872b0663a405097874c 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,6 +5,51 @@
  */
 #include "cache.h"
 
+static void safe_create_dir(const char *dir)
+{
+       if (mkdir(dir, 0777) < 0) {
+               if (errno != EEXIST) {
+                       perror(dir);
+                       exit(1);
+               }
+       }
+}
+
+static void create_default_files(const char *git_dir)
+{
+       unsigned len = strlen(git_dir);
+       static char path[PATH_MAX];
+
+       if (len > sizeof(path)-50)
+               die("insane git directory %s", git_dir);
+       memcpy(path, git_dir, len);
+
+       if (len && path[len-1] != '/')
+               path[len++] = '/';
+
+       /*
+        * Create .git/refs/{heads,tags}
+        */
+       strcpy(path + len, "refs");
+       safe_create_dir(path);
+       strcpy(path + len, "refs/heads");
+       safe_create_dir(path);
+       strcpy(path + len, "refs/tags");
+       safe_create_dir(path);
+
+       /*
+        * Create the default symlink from ".git/HEAD" to the "master"
+        * branch
+        */
+       strcpy(path + len, "HEAD");
+       if (symlink("refs/heads/master", path) < 0) {
+               if (errno != EEXIST) {
+                       perror(path);
+                       exit(1);
+               }
+       }
+}
+
 /*
  * If you want to, you can share the DB area with any number of branches.
  * That has advantages: you can save space by sharing all the SHA1 objects.
@@ -13,41 +58,36 @@
  */
 int main(int argc, char **argv)
 {
-       char *sha1_dir, *path;
+       const char *git_dir;
+       const char *sha1_dir;
+       char *path;
        int len, i;
 
-       if (mkdir(".git", 0755) < 0) {
-               perror("unable to create .git directory");
-               exit(1);
-       }
-
-       sha1_dir = getenv(DB_ENVIRONMENT);
-       if (sha1_dir) {
-               struct stat st;
-               if (!stat(sha1_dir, &st) && S_ISDIR(st.st_mode))
-                       return 0;
-               fprintf(stderr, "DB_ENVIRONMENT set to bad directory %s: ", sha1_dir);
+       /*
+        * Set up the default .git directory contents
+        */
+       git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+       if (!git_dir) {
+               git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
+               fprintf(stderr, "defaulting to local storage area\n");
        }
+       safe_create_dir(git_dir);
+       create_default_files(git_dir);
 
-       sha1_dir = DEFAULT_DB_ENVIRONMENT;
-       fprintf(stderr, "defaulting to private storage area\n");
+       /*
+        * And set up the object store.
+        */
+       sha1_dir = get_object_directory();
        len = strlen(sha1_dir);
-       if (mkdir(sha1_dir, 0755) < 0) {
-               if (errno != EEXIST) {
-                       perror(sha1_dir);
-                       exit(1);
-               }
-       }
-       path = malloc(len + 40);
+       path = xmalloc(len + 40);
        memcpy(path, sha1_dir, len);
+
+       safe_create_dir(sha1_dir);
        for (i = 0; i < 256; i++) {
                sprintf(path+len, "/%02x", i);
-               if (mkdir(path, 0755) < 0) {
-                       if (errno != EEXIST) {
-                               perror(path);
-                               exit(1);
-                       }
-               }
+               safe_create_dir(path);
        }
+       strcpy(path+len, "/pack");
+       safe_create_dir(path);
        return 0;
 }