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)
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,
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,
template_path, template_len,
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);
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
+ * 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, len, template_path);
+
+ /* 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;
+ 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[] =
for (i = 1; i < argc; i++, argv++) {
char *arg = argv[1];
- if (arg[0] != '-')
- break;
- else if (!strncmp(arg, "--template=", 11))
+ 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);
+
+ /* 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);
/*
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");