git-upload-pack: More efficient usage of the has_sha1 array

diff --git a/init-db.c b/init-db.c
index fcb55f6e77f81f03c09f956ea2a63323a19c6217..aabc09f4e1f714f5b4c1adba388fc47b41e16b0b 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,6 +5,10 @@
  */
 #include "cache.h"
 
+#ifndef DEFAULT_GIT_TEMPLATE_DIR
+#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates/"
+#endif
+
 static void safe_create_dir(const char *dir)
 {
        if (mkdir(dir, 0777) < 0) {
@@ -127,39 +131,42 @@ static void copy_templates_1(char *path, int baselen,
        }
 }
 
-static void copy_templates(const char *git_dir)
+static void copy_templates(const char *git_dir, int len, char *template_dir)
 {
        char path[PATH_MAX];
        char template_path[PATH_MAX];
-       char *template_dir;
-       int len, template_len;
+       int template_len;
        DIR *dir;
 
-       strcpy(path, git_dir);
-       len = strlen(path);
-       template_dir = gitenv(TEMPLATE_DIR_ENVIRONMENT);
        if (!template_dir)
-               template_dir = DEFAULT_GIT_TEMPLATE_ENVIRONMENT;
+               template_dir = DEFAULT_GIT_TEMPLATE_DIR;
        strcpy(template_path, template_dir);
        template_len = strlen(template_path);
        if (template_path[template_len-1] != '/') {
                template_path[template_len++] = '/';
                template_path[template_len] = 0;
        }
-
        dir = opendir(template_path);
-       if (!dir)
+       if (!dir) {
+               fprintf(stderr, "warning: templates not found %s\n",
+                       template_dir);
                return;
+       }
+
+       memcpy(path, git_dir, len);
+       path[len] = 0;
        copy_templates_1(path, len,
                         template_path, template_len,
                         dir);
        closedir(dir);
 }
 
-static void create_default_files(const char *git_dir)
+static void create_default_files(const char *git_dir,
+                                char *template_path)
 {
        unsigned len = strlen(git_dir);
        static char path[PATH_MAX];
+       unsigned char sha1[20];
 
        if (len > sizeof(path)-50)
                die("insane git directory %s", git_dir);
@@ -180,18 +187,20 @@ static void create_default_files(const char *git_dir)
 
        /*
         * Create the default symlink from ".git/HEAD" to the "master"
-        * branch
+        * branch, if it does not exist yet.
         */
        strcpy(path + len, "HEAD");
-       if (symlink("refs/heads/master", path) < 0) {
-               if (errno != EEXIST) {
-                       perror(path);
+       if (read_ref(path, sha1) < 0) {
+               if (create_symref(path, "refs/heads/master") < 0)
                        exit(1);
-               }
        }
-       copy_templates(path);
+       path[len] = 0;
+       copy_templates(path, len, template_path);
 }
 
+static const char init_db_usage[] =
+"git-init-db [--template=<template-directory>]";
+
 /*
  * 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.
@@ -202,19 +211,29 @@ int main(int argc, char **argv)
 {
        const char *git_dir;
        const char *sha1_dir;
-       char *path;
+       char *path, *template_dir = NULL;
        int len, i;
 
+       for (i = 1; i < argc; i++, argv++) {
+               char *arg = argv[1];
+               if (arg[0] != '-')
+                       break;
+               else if (!strncmp(arg, "--template=", 11))
+                       template_dir = arg+11;
+               else
+                       die(init_db_usage);
+       }
+
        /*
         * Set up the default .git directory contents
         */
-       git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+       git_dir = getenv(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);
+       create_default_files(git_dir, template_dir);
 
        /*
         * And set up the object store.
@@ -231,5 +250,7 @@ int main(int argc, char **argv)
        }
        strcpy(path+len, "/pack");
        safe_create_dir(path);
+       strcpy(path+len, "/info");
+       safe_create_dir(path);
        return 0;
 }