index a3b76de2bb1c18e2f3b8cdf5799c3c650b16d027..3ee9c2eec842900dac6bf9717c1739b111f89893 100644 (file)
--- a/setup.c
+++ b/setup.c
initialized = 1;
}
-static int check_repository_format_gently(int *nongit_ok)
+static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
{
- git_config(check_repository_format_version, NULL);
+ char repo_config[PATH_MAX+1];
+
+ /*
+ * git_config() can't be used here because it calls git_pathdup()
+ * to get $GIT_CONFIG/config. That call will make setup_git_env()
+ * set git_dir to ".git".
+ *
+ * We are in gitdir setup, no git dir has been found useable yet.
+ * Use a gentler version of git_config() to check if this repo
+ * is a good one.
+ */
+ snprintf(repo_config, PATH_MAX, "%s/config", gitdir);
+ git_config_early(check_repository_format_version, NULL, repo_config);
if (GIT_REPO_VERSION < repository_format_version) {
if (!nongit_ok)
die ("Expected git repo version <= %d, found %d",
static char buffer[1024 + 1];
const char *retval;
+ if (startup_info)
+ startup_info->setup_explicit = 1;
if (PATH_MAX - 40 < strlen(gitdirenv))
die("'$%s' too big", GIT_DIR_ENVIRONMENT);
if (!is_git_directory(gitdirenv)) {
if (!work_tree_env) {
retval = set_work_tree(gitdirenv);
/* config may override worktree */
- if (check_repository_format_gently(nongit_ok))
+ if (check_repository_format_gently(gitdirenv, nongit_ok))
return NULL;
return retval;
}
- if (check_repository_format_gently(nongit_ok))
+ if (check_repository_format_gently(gitdirenv, nongit_ok))
return NULL;
retval = get_relative_cwd(buffer, sizeof(buffer) - 1,
get_git_work_tree());
return retval;
}
-static int cwd_contains_git_dir(const char **gitfile_dirp)
+static const char *setup_discovered_git_dir(const char *gitdir,
+ char *cwd, int offset, int len,
+ int *nongit_ok)
{
- const char *gitfile_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
- *gitfile_dirp = gitfile_dir;
- if (gitfile_dir) {
- if (set_git_dir(gitfile_dir))
- die("Repository setup failed");
- return 1;
- }
- return is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT);
-}
+ if (check_repository_format_gently(gitdir, nongit_ok))
+ return NULL;
-static const char *setup_discovered_git_dir(const char *work_tree_env,
- int offset, int len, char *cwd, int *nongit_ok)
-{
- int root_len;
+ /* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */
+ if (is_bare_repository_cfg > 0) {
+ set_git_dir(offset == len ? gitdir : make_absolute_path(gitdir));
+ if (chdir(cwd))
+ die_errno("Could not come back to cwd");
+ return NULL;
+ }
+ /* #0, #1, #5, #8, #9, #12, #13 */
+ set_git_work_tree(".");
+ if (strcmp(gitdir, DEFAULT_GIT_DIR_ENVIRONMENT))
+ set_git_dir(gitdir);
inside_git_dir = 0;
- if (!work_tree_env)
- inside_work_tree = 1;
- root_len = offset_1st_component(cwd);
- git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);
- if (check_repository_format_gently(nongit_ok))
- return NULL;
+ inside_work_tree = 1;
if (offset == len)
return NULL;
return cwd + offset;
}
-static const char *setup_bare_git_dir(const char *work_tree_env,
- int offset, int len, char *cwd, int *nongit_ok)
+/* #16.1, #17.1, #20.1, #21.1, #22.1 (see t1510) */
+static const char *setup_bare_git_dir(char *cwd, int offset, int len, int *nongit_ok)
{
int root_len;
+ if (check_repository_format_gently(".", nongit_ok))
+ return NULL;
+
inside_git_dir = 1;
- if (!work_tree_env)
- inside_work_tree = 0;
+ inside_work_tree = 0;
if (offset != len) {
if (chdir(cwd))
die_errno("Cannot come back to cwd");
root_len = offset_1st_component(cwd);
cwd[offset > root_len ? offset : root_len] = '\0';
set_git_dir(cwd);
- } else
+ }
+ else
set_git_dir(".");
- check_repository_format_gently(nongit_ok);
return NULL;
}
const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
static char cwd[PATH_MAX+1];
- const char *gitdirenv;
- const char *gitfile_dir;
+ const char *gitdirenv, *ret;
+ char *gitfile;
int len, offset, ceil_offset;
dev_t current_device = 0;
int one_filesystem = 1;
if (one_filesystem)
current_device = get_device_or_die(".", NULL);
for (;;) {
- if (cwd_contains_git_dir(&gitfile_dir))
- return setup_discovered_git_dir(work_tree_env, offset,
- len, cwd, nongit_ok);
+ gitfile = (char*)read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+ if (gitfile)
+ gitdirenv = gitfile = xstrdup(gitfile);
+ else {
+ if (is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT))
+ gitdirenv = DEFAULT_GIT_DIR_ENVIRONMENT;
+ }
+
+ if (gitdirenv) {
+ ret = setup_discovered_git_dir(gitdirenv,
+ cwd, offset, len,
+ nongit_ok);
+ free(gitfile);
+ return ret;
+ }
+ free(gitfile);
+
if (is_git_directory("."))
- return setup_bare_git_dir(work_tree_env, offset,
- len, cwd, nongit_ok);
+ return setup_bare_git_dir(cwd, offset, len, nongit_ok);
+
while (--offset > ceil_offset && cwd[offset] != '/');
if (offset <= ceil_offset)
return setup_nongit(cwd, nongit_ok);
@@ -590,7 +617,7 @@ int check_repository_format_version(const char *var, const char *value, void *cb
int check_repository_format(void)
{
- return check_repository_format_gently(NULL);
+ return check_repository_format_gently(get_git_dir(), NULL);
}
/*
const char *retval = setup_git_directory_gently(NULL);
/* If the work tree is not the default one, recompute prefix */
- if (inside_work_tree < 0) {
+ if ((!startup_info || startup_info->setup_explicit) &&
+ inside_work_tree < 0) {
static char buffer[PATH_MAX + 1];
char *rel;
if (retval && chdir(retval))