git-apply: work from subdirectory.

diff --git a/init-db.c b/init-db.c
index aabc09f4e1f714f5b4c1adba388fc47b41e16b0b..8195b6842ea4eb1f6e3e0d72f8c5900b4d7e2a8a 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -21,7 +21,7 @@ static void safe_create_dir(const char *dir)
 
 static int copy_file(const char *dst, const char *src, int mode)
 {
-       int fdi, fdo;
+       int fdi, fdo, status;
 
        mode = (mode & 0111) ? 0777 : 0666;
        if ((fdi = open(src, O_RDONLY)) < 0)
@@ -30,30 +30,9 @@ static int copy_file(const char *dst, const char *src, int mode)
                close(fdi);
                return fdo;
        }
-       while (1) {
-               char buf[BUFSIZ];
-               ssize_t leni, leno, ofs;
-               leni = read(fdi, buf, sizeof(buf));
-               if (leni < 0) {
-               error_return:
-                       close(fdo);
-                       close(fdi);
-                       return -1;
-               }
-               if (!leni)
-                       break;
-               ofs = 0;
-               do {
-                       leno = write(fdo, buf+ofs, leni);
-                       if (leno < 0)
-                               goto error_return;
-                       leni -= leno;
-                       ofs += leno;
-               } while (0 < leni);
-       }
+       status = copy_fd(fdi, fdo);
        close(fdo);
-       close(fdi);
-       return 0;
+       return status;
 }
 
 static void copy_templates_1(char *path, int baselen,
@@ -153,6 +132,23 @@ static void copy_templates(const char *git_dir, int len, char *template_dir)
                return;
        }
 
+       /* Make sure that template is from the correct vintage */
+       strcpy(template_path + template_len, "config");
+       repository_format_version = 0;
+       git_config_from_file(check_repository_format_version,
+                            template_path);
+       template_path[template_len] = 0;
+
+       if (repository_format_version &&
+           repository_format_version != GIT_REPO_VERSION) {
+               fprintf(stderr, "warning: not copying templates of "
+                       "a wrong format version %d from '%s'\n",
+                       repository_format_version,
+                       template_dir);
+               closedir(dir);
+               return;
+       }
+
        memcpy(path, git_dir, len);
        path[len] = 0;
        copy_templates_1(path, len,
@@ -161,12 +157,13 @@ static void copy_templates(const char *git_dir, int len, char *template_dir)
        closedir(dir);
 }
 
-static void create_default_files(const char *git_dir,
-                                char *template_path)
+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];
+       struct stat st1;
+       char repo_version_string[10];
 
        if (len > sizeof(path)-50)
                die("insane git directory %s", git_dir);
@@ -185,6 +182,15 @@ static void create_default_files(const char *git_dir,
        strcpy(path + len, "refs/tags");
        safe_create_dir(path);
 
+       /* First copy the templates -- we might have the default
+        * config file there, in which case we would want to read
+        * from it after installing.
+        */
+       path[len] = 0;
+       copy_templates(path, len, template_path);
+
+       git_config(git_default_config);
+
        /*
         * Create the default symlink from ".git/HEAD" to the "master"
         * branch, if it does not exist yet.
@@ -194,8 +200,23 @@ static void create_default_files(const char *git_dir,
                if (create_symref(path, "refs/heads/master") < 0)
                        exit(1);
        }
+
+       /* This forces creation of new config file */
+       sprintf(repo_version_string, "%d", GIT_REPO_VERSION);
+       git_config_set("core.repositoryformatversion", repo_version_string);
+
        path[len] = 0;
-       copy_templates(path, len, template_path);
+       strcpy(path + len, "config");
+
+       /* Check filemode trustability */
+       if (!lstat(path, &st1)) {
+               struct stat st2;
+               int filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
+                               !lstat(path, &st2) &&
+                               st1.st_mode != st2.st_mode);
+               git_config_set("core.filemode",
+                              filemode ? "true" : "false");
+       }
 }
 
 static const char init_db_usage[] =
@@ -233,6 +254,14 @@ int main(int argc, char **argv)
                fprintf(stderr, "defaulting to local storage area\n");
        }
        safe_create_dir(git_dir);
+
+       /* Check to see if the repository version is right.
+        * Note that a newly created repository does not have
+        * config file, so this will not fail.  What we are catching
+        * is an attempt to reinitialize new repository with an old tool.
+        */
+       check_repository_format();
+
        create_default_files(git_dir, template_dir);
 
        /*
@@ -244,10 +273,6 @@ int main(int argc, char **argv)
        memcpy(path, sha1_dir, len);
 
        safe_create_dir(sha1_dir);
-       for (i = 0; i < 256; i++) {
-               sprintf(path+len, "/%02x", i);
-               safe_create_dir(path);
-       }
        strcpy(path+len, "/pack");
        safe_create_dir(path);
        strcpy(path+len, "/info");