X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=init-db.c;h=c78c4951144e04d97773a872b0663a405097874c;hb=0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e;hp=1fcef0b373ccec8693ffab22adfe94f4f3c5b86d;hpb=19b2860cba5742ab31fd682b80fefefac19be141;p=git.git

diff --git a/init-db.c b/init-db.c
index 1fcef0b3..c78c4951 100644
--- a/init-db.c
+++ b/init-db.c
@@ -5,52 +5,89 @@
  */
 #include "cache.h"
 
-int main(int argc, char **argv)
+static void safe_create_dir(const char *dir)
 {
-	char *sha1_dir = getenv(DB_ENVIRONMENT), *path;
-	int len, i;
-
-	if (mkdir(".dircache", 0700) < 0) {
-		perror("unable to create .dircache");
-		exit(1);
+	if (mkdir(dir, 0777) < 0) {
+		if (errno != EEXIST) {
+			perror(dir);
+			exit(1);
+		}
 	}
+}
+
+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++] = '/';
 
 	/*
-	 * 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.
-	 * On the other hand, it might just make lookup slower and messier. You
-	 * be the judge.
+	 * Create .git/refs/{heads,tags}
 	 */
-	sha1_dir = getenv(DB_ENVIRONMENT);
-	if (sha1_dir) {
-		struct stat st;
-		if (!stat(sha1_dir, &st) < 0 && S_ISDIR(st.st_mode))
-			return 0;
-		fprintf(stderr, "DB_ENVIRONMENT set to bad directory %s: ", sha1_dir);
-	}
+	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);
 
 	/*
-	 * The default case is to have a DB per managed directory. 
+	 * Create the default symlink from ".git/HEAD" to the "master"
+	 * branch
 	 */
-	sha1_dir = DEFAULT_DB_ENVIRONMENT;
-	fprintf(stderr, "defaulting to private storage area\n");
-	len = strlen(sha1_dir);
-	if (mkdir(sha1_dir, 0700) < 0) {
+	strcpy(path + len, "HEAD");
+	if (symlink("refs/heads/master", path) < 0) {
 		if (errno != EEXIST) {
-			perror(sha1_dir);
+			perror(path);
 			exit(1);
 		}
 	}
-	path = malloc(len + 40);
+}
+
+/*
+ * 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.
+ * On the other hand, it might just make lookup slower and messier. You
+ * be the judge.  The default case is to have one DB per managed directory.
+ */
+int main(int argc, char **argv)
+{
+	const char *git_dir;
+	const char *sha1_dir;
+	char *path;
+	int len, i;
+
+	/*
+	 * 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);
+
+	safe_create_dir(sha1_dir);
 	for (i = 0; i < 256; i++) {
 		sprintf(path+len, "/%02x", i);
-		if (mkdir(path, 0700) < 0) {
-			if (errno != EEXIST) {
-				perror(path);
-				exit(1);
-			}
-		}
+		safe_create_dir(path);
 	}
+	strcpy(path+len, "/pack");
+	safe_create_dir(path);
 	return 0;
 }