Make "git prune" use the "--full" flag to git-fsck-cache

diff --git a/init-db.c b/init-db.c
index dad06351ca35d0d2f68cd9e719c49805386f96fa..c78c4951144e04d97773a872b0663a405097874c 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,9 +5,9 @@
  */
 #include "cache.h"
 
-void safe_create_dir(char *dir)
+static void safe_create_dir(const char *dir)
 {
-       if (mkdir(dir, 0755) < 0) {
+       if (mkdir(dir, 0777) < 0) {
                if (errno != EEXIST) {
                        perror(dir);
                        exit(1);
@@ -15,6 +15,41 @@ void safe_create_dir(char *dir)
        }
 }
 
+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.
@@ -23,18 +58,28 @@ void safe_create_dir(char *dir)
  */
 int main(int argc, char **argv)
 {
-       char *sha1_dir, *path;
+       const char *git_dir;
+       const char *sha1_dir;
+       char *path;
        int len, i;
 
-       safe_create_dir(".git");
-
-       sha1_dir = getenv(DB_ENVIRONMENT);
-       if (!sha1_dir) {
-               sha1_dir = DEFAULT_DB_ENVIRONMENT;
+       /*
+        * 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);
+
+       /*
+        * And set up the object store.
+        */
+       sha1_dir = get_object_directory();
        len = strlen(sha1_dir);
-       path = malloc(len + 40);
+       path = xmalloc(len + 40);
        memcpy(path, sha1_dir, len);
 
        safe_create_dir(sha1_dir);
@@ -42,5 +87,7 @@ int main(int argc, char **argv)
                sprintf(path+len, "/%02x", i);
                safe_create_dir(path);
        }
+       strcpy(path+len, "/pack");
+       safe_create_dir(path);
        return 0;
 }