ls-files: --others should not say unmerged paths are unknown.

diff --git a/init-db.c b/init-db.c
index 1fb3f7fa79136f296ece9e04f6fdbf34bb40eeeb..bd88291b0efd3eb9c46195d413db1aba820db2dd 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,
@@ -154,6 +133,7 @@ static void copy_templates(const char *git_dir, int len, char *template_dir)
        }
 
        memcpy(path, git_dir, len);
+       path[len] = 0;
        copy_templates_1(path, len,
                         template_path, template_len,
                         dir);
@@ -165,6 +145,7 @@ static void create_default_files(const char *git_dir,
 {
        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);
@@ -185,16 +166,52 @@ 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);
-               }
        }
+       path[len] = 0;
        copy_templates(path, len, template_path);
+
+       /*
+        * Find out if we can trust the executable bit.
+        */
+       safe_create_dir(path);
+       strcpy(path + len, "config");
+       if (access(path, R_OK) < 0) {
+               static const char contents[] =
+                       "#\n"
+                       "# This is the config file\n"
+                       "#\n"
+                       "\n"
+                       "; core variables\n"
+                       "[core]\n"
+                       "       ; Don't trust file modes\n"
+                       "       filemode = false\n"
+                       "\n";
+               FILE *config = fopen(path, "w");
+               struct stat st;
+
+               if (!config)
+                       die("Can not write to %s?", path);
+
+               fwrite(contents, sizeof(contents)-1, 1, config);
+
+               fclose(config);
+
+               if (!lstat(path, &st)) {
+                       struct stat st2;
+                       if (!chmod(path, st.st_mode ^ S_IXUSR) &&
+                                       !lstat(path, &st2) &&
+                                       st.st_mode != st2.st_mode)
+                               unlink(path);
+                       else
+                               fprintf(stderr, "Ignoring file modes\n");
+               }
+       }
 }
 
 static const char init_db_usage[] =
@@ -226,7 +243,7 @@ int main(int argc, char **argv)
        /*
         * 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");
@@ -243,11 +260,9 @@ 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");
+       safe_create_dir(path);
        return 0;
 }