X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=init-db.c;h=c78c4951144e04d97773a872b0663a405097874c;hb=8037d1a31a60e9645c56a8bebb01d0e13970b93f;hp=b6bb78356762bd28261949da54638f46776e6d4b;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git

diff --git a/init-db.c b/init-db.c
index b6bb7835..c78c4951 100644
--- a/init-db.c
+++ b/init-db.c
@@ -5,9 +5,9 @@
  */
 #include "cache.h"
 
-void safe_create_dir(const 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(const 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,26 @@ void safe_create_dir(const char *dir)
  */
 int main(int argc, char **argv)
 {
+	const char *git_dir;
 	const char *sha1_dir;
 	char *path;
 	int len, i;
 
-	sha1_dir = get_object_directory();
-	if (!gitenv(DB_ENVIRONMENT) && !gitenv(GIT_DIR_ENVIRONMENT)) {
-		/* We create leading paths only when we fall back
-		 * to local .git/objects, at least for now.
-		 */
-		safe_create_dir(DEFAULT_GIT_DIR_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 = xmalloc(len + 40);
 	memcpy(path, sha1_dir, len);
@@ -44,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;
 }