mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Shawn O. Pearce](/assets/img/avatar_default.png)
New and experienced Git users alike are finding out too late that they forgot to enable reflogs in the current repository, and cannot use the information stored within it to recover from an incorrectly entered command such as `git reset --hard HEAD^^^` when they really meant HEAD^^ (aka HEAD~2). So enable reflogs by default in all future versions of Git, unless the user specifically disables it with: [core] logAllRefUpdates = false in their .git/config or ~/.gitconfig. We only enable reflogs in repositories that have a working directory associated with them, as shared/bare repositories do not have an easy means to prune away old log entries, or may fail logging entirely if the user's gecos information is not valid during a push. This heuristic was suggested on the mailing list by Junio. Documentation was also updated to indicate the new default behavior. We probably should start to teach usuing the reflog to recover from mistakes in some of the tutorial material, as new users are likely to make a few along the way and will feel better knowing they can recover from them quickly and easily, without fsck-objects' lost+found features. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
329 lines
8.5 KiB
C
329 lines
8.5 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
|
|
|
|
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);
|
|
close(fdo);
|
|
|
|
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-db 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 = 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;
|
|
|
|
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") < 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 */
|
|
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");
|
|
}
|
|
|
|
/* Enable logAllRefUpdates if a working tree is attached */
|
|
if (!is_bare_git_dir(git_dir))
|
|
git_config_set("core.logallrefupdates", "true");
|
|
return reinit;
|
|
}
|
|
|
|
static const char init_db_usage[] =
|
|
"git-init-db [--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;
|
|
|
|
for (i = 1; i < argc; i++, argv++) {
|
|
const char *arg = argv[1];
|
|
if (!strncmp(arg, "--template=", 11))
|
|
template_dir = arg+11;
|
|
else if (!strcmp(arg, "--shared"))
|
|
shared_repository = PERM_GROUP;
|
|
else if (!strncmp(arg, "--shared=", 9))
|
|
shared_repository = git_config_perm("arg", arg+9);
|
|
else
|
|
usage(init_db_usage);
|
|
}
|
|
|
|
/*
|
|
* 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");
|
|
}
|
|
|
|
printf("%s%s Git repository in %s/\n",
|
|
reinit ? "Reinitialized existing" : "Initialized empty",
|
|
shared_repository ? " shared" : "",
|
|
git_dir);
|
|
|
|
return 0;
|
|
}
|