mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Johannes Schindelin](/assets/img/avatar_default.png)
The old version of work-tree support was an unholy mess, barely readable, and not to the point. For example, why do you have to provide a worktree, when it is not used? As in "git status". Now it works. Another riddle was: if you can have work trees inside the git dir, why are some programs complaining that they need a work tree? IOW it is allowed to call $ git --git-dir=../ --work-tree=. bla when you really want to. In this case, you are both in the git directory and in the working tree. So, programs have to actually test for the right thing, namely if they are inside a working tree, and not if they are inside a git directory. Also, GIT_DIR=../.git should behave the same as if no GIT_DIR was specified, unless there is a repository in the current working directory. It does now. The logic to determine if a repository is bare, or has a work tree (tertium non datur), is this: --work-tree=bla overrides GIT_WORK_TREE, which overrides core.bare = true, which overrides core.worktree, which overrides GIT_DIR/.. when GIT_DIR ends in /.git, which overrides the directory in which .git/ was found. In related news, a long standing bug was fixed: when in .git/bla/x.git/, which is a bare repository, git formerly assumed ../.. to be the appropriate git dir. This problem was reported by Shawn Pearce to have caused much pain, where a colleague mistakenly ran "git init" in "/" a long time ago, and bare repositories just would not work. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
358 lines
9.4 KiB
C
358 lines
9.4 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "builtin.h"
|
|
|
|
#ifndef DEFAULT_GIT_TEMPLATE_DIR
|
|
#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
|
|
#endif
|
|
|
|
#ifdef NO_TRUSTABLE_FILEMODE
|
|
#define TEST_FILEMODE 0
|
|
#else
|
|
#define TEST_FILEMODE 1
|
|
#endif
|
|
|
|
static void safe_create_dir(const char *dir, int share)
|
|
{
|
|
if (mkdir(dir, 0777) < 0) {
|
|
if (errno != EEXIST) {
|
|
perror(dir);
|
|
exit(1);
|
|
}
|
|
}
|
|
else if (share && adjust_shared_perm(dir))
|
|
die("Could not make %s writable by group\n", dir);
|
|
}
|
|
|
|
static int copy_file(const char *dst, const char *src, int mode)
|
|
{
|
|
int fdi, fdo, status;
|
|
|
|
mode = (mode & 0111) ? 0777 : 0666;
|
|
if ((fdi = open(src, O_RDONLY)) < 0)
|
|
return fdi;
|
|
if ((fdo = open(dst, O_WRONLY | O_CREAT | O_EXCL, mode)) < 0) {
|
|
close(fdi);
|
|
return fdo;
|
|
}
|
|
status = copy_fd(fdi, fdo);
|
|
if (close(fdo) != 0)
|
|
return error("%s: write error: %s", dst, strerror(errno));
|
|
|
|
if (!status && adjust_shared_perm(dst))
|
|
return -1;
|
|
|
|
return status;
|
|
}
|
|
|
|
static void copy_templates_1(char *path, int baselen,
|
|
char *template, int template_baselen,
|
|
DIR *dir)
|
|
{
|
|
struct dirent *de;
|
|
|
|
/* Note: if ".git/hooks" file exists in the repository being
|
|
* re-initialized, /etc/core-git/templates/hooks/update would
|
|
* cause git-init to fail here. I think this is sane but
|
|
* it means that the set of templates we ship by default, along
|
|
* with the way the namespace under .git/ is organized, should
|
|
* be really carefully chosen.
|
|
*/
|
|
safe_create_dir(path, 1);
|
|
while ((de = readdir(dir)) != NULL) {
|
|
struct stat st_git, st_template;
|
|
int namelen;
|
|
int exists = 0;
|
|
|
|
if (de->d_name[0] == '.')
|
|
continue;
|
|
namelen = strlen(de->d_name);
|
|
if ((PATH_MAX <= baselen + namelen) ||
|
|
(PATH_MAX <= template_baselen + namelen))
|
|
die("insanely long template name %s", de->d_name);
|
|
memcpy(path + baselen, de->d_name, namelen+1);
|
|
memcpy(template + template_baselen, de->d_name, namelen+1);
|
|
if (lstat(path, &st_git)) {
|
|
if (errno != ENOENT)
|
|
die("cannot stat %s", path);
|
|
}
|
|
else
|
|
exists = 1;
|
|
|
|
if (lstat(template, &st_template))
|
|
die("cannot stat template %s", template);
|
|
|
|
if (S_ISDIR(st_template.st_mode)) {
|
|
DIR *subdir = opendir(template);
|
|
int baselen_sub = baselen + namelen;
|
|
int template_baselen_sub = template_baselen + namelen;
|
|
if (!subdir)
|
|
die("cannot opendir %s", template);
|
|
path[baselen_sub++] =
|
|
template[template_baselen_sub++] = '/';
|
|
path[baselen_sub] =
|
|
template[template_baselen_sub] = 0;
|
|
copy_templates_1(path, baselen_sub,
|
|
template, template_baselen_sub,
|
|
subdir);
|
|
closedir(subdir);
|
|
}
|
|
else if (exists)
|
|
continue;
|
|
else if (S_ISLNK(st_template.st_mode)) {
|
|
char lnk[256];
|
|
int len;
|
|
len = readlink(template, lnk, sizeof(lnk));
|
|
if (len < 0)
|
|
die("cannot readlink %s", template);
|
|
if (sizeof(lnk) <= len)
|
|
die("insanely long symlink %s", template);
|
|
lnk[len] = 0;
|
|
if (symlink(lnk, path))
|
|
die("cannot symlink %s %s", lnk, path);
|
|
}
|
|
else if (S_ISREG(st_template.st_mode)) {
|
|
if (copy_file(path, template, st_template.st_mode))
|
|
die("cannot copy %s to %s", template, path);
|
|
}
|
|
else
|
|
error("ignoring template %s", template);
|
|
}
|
|
}
|
|
|
|
static void copy_templates(const char *git_dir, int len, const char *template_dir)
|
|
{
|
|
char path[PATH_MAX];
|
|
char template_path[PATH_MAX];
|
|
int template_len;
|
|
DIR *dir;
|
|
|
|
if (!template_dir) {
|
|
template_dir = getenv(TEMPLATE_DIR_ENVIRONMENT);
|
|
if (!template_dir)
|
|
template_dir = DEFAULT_GIT_TEMPLATE_DIR;
|
|
}
|
|
strcpy(template_path, template_dir);
|
|
template_len = strlen(template_path);
|
|
if (template_path[template_len-1] != '/') {
|
|
template_path[template_len++] = '/';
|
|
template_path[template_len] = 0;
|
|
}
|
|
dir = opendir(template_path);
|
|
if (!dir) {
|
|
fprintf(stderr, "warning: templates not found %s\n",
|
|
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,
|
|
template_path, template_len,
|
|
dir);
|
|
closedir(dir);
|
|
}
|
|
|
|
static int create_default_files(const char *git_dir, const 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];
|
|
int reinit;
|
|
int filemode;
|
|
|
|
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, 1);
|
|
strcpy(path + len, "refs/heads");
|
|
safe_create_dir(path, 1);
|
|
strcpy(path + len, "refs/tags");
|
|
safe_create_dir(path, 1);
|
|
|
|
/* 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);
|
|
|
|
/*
|
|
* We would have created the above under user's umask -- under
|
|
* shared-repository settings, we would need to fix them up.
|
|
*/
|
|
if (shared_repository) {
|
|
path[len] = 0;
|
|
adjust_shared_perm(path);
|
|
strcpy(path + len, "refs");
|
|
adjust_shared_perm(path);
|
|
strcpy(path + len, "refs/heads");
|
|
adjust_shared_perm(path);
|
|
strcpy(path + len, "refs/tags");
|
|
adjust_shared_perm(path);
|
|
}
|
|
|
|
/*
|
|
* Create the default symlink from ".git/HEAD" to the "master"
|
|
* branch, if it does not exist yet.
|
|
*/
|
|
strcpy(path + len, "HEAD");
|
|
reinit = !read_ref("HEAD", sha1);
|
|
if (!reinit) {
|
|
if (create_symref("HEAD", "refs/heads/master", NULL) < 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;
|
|
strcpy(path + len, "config");
|
|
|
|
/* Check filemode trustability */
|
|
filemode = TEST_FILEMODE;
|
|
if (TEST_FILEMODE && !lstat(path, &st1)) {
|
|
struct stat st2;
|
|
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");
|
|
|
|
if (is_bare_repository())
|
|
git_config_set("core.bare", "true");
|
|
else {
|
|
const char *work_tree = get_git_work_tree();
|
|
git_config_set("core.bare", "false");
|
|
/* allow template config file to override the default */
|
|
if (log_all_ref_updates == -1)
|
|
git_config_set("core.logallrefupdates", "true");
|
|
if (work_tree != git_work_tree_cfg)
|
|
git_config_set("core.worktree", work_tree);
|
|
}
|
|
return reinit;
|
|
}
|
|
|
|
static const char init_db_usage[] =
|
|
"git-init [-q | --quiet] [--template=<template-directory>] [--shared]";
|
|
|
|
/*
|
|
* 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 cmd_init_db(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *git_dir;
|
|
const char *sha1_dir;
|
|
const char *template_dir = NULL;
|
|
char *path;
|
|
int len, i, reinit;
|
|
int quiet = 0;
|
|
|
|
for (i = 1; i < argc; i++, argv++) {
|
|
const char *arg = argv[1];
|
|
if (!prefixcmp(arg, "--template="))
|
|
template_dir = arg+11;
|
|
else if (!strcmp(arg, "--shared"))
|
|
shared_repository = PERM_GROUP;
|
|
else if (!prefixcmp(arg, "--shared="))
|
|
shared_repository = git_config_perm("arg", arg+9);
|
|
else if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet"))
|
|
quiet = 1;
|
|
else
|
|
usage(init_db_usage);
|
|
}
|
|
|
|
git_work_tree_cfg = xcalloc(PATH_MAX, 1);
|
|
if (!getcwd(git_work_tree_cfg, PATH_MAX))
|
|
die ("Cannot access current working directory.");
|
|
if (access(get_git_work_tree(), X_OK))
|
|
die ("Cannot access work tree '%s'", get_git_work_tree());
|
|
|
|
/*
|
|
* Set up the default .git directory contents
|
|
*/
|
|
git_dir = getenv(GIT_DIR_ENVIRONMENT);
|
|
if (!git_dir)
|
|
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
|
|
safe_create_dir(git_dir, 0);
|
|
|
|
/* 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();
|
|
|
|
reinit = create_default_files(git_dir, template_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, 1);
|
|
strcpy(path+len, "/pack");
|
|
safe_create_dir(path, 1);
|
|
strcpy(path+len, "/info");
|
|
safe_create_dir(path, 1);
|
|
|
|
if (shared_repository) {
|
|
char buf[10];
|
|
/* We do not spell "group" and such, so that
|
|
* the configuration can be read by older version
|
|
* of git.
|
|
*/
|
|
sprintf(buf, "%d", shared_repository);
|
|
git_config_set("core.sharedrepository", buf);
|
|
git_config_set("receive.denyNonFastforwards", "true");
|
|
}
|
|
|
|
if (!quiet)
|
|
printf("%s%s Git repository in %s/\n",
|
|
reinit ? "Reinitialized existing" : "Initialized empty",
|
|
shared_repository ? " shared" : "",
|
|
git_dir);
|
|
|
|
return 0;
|
|
}
|