summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-11-26 22:32:38 +0700
committerJunio C Hamano <gitster@pobox.com>2010-12-22 14:34:24 -0800
commit9951d3b37ec7298384640b11d07a990ef031fe83 (patch)
treefe661f2e8f260e6484a417b9682d2fe3fb6976da /setup.c
parent101662c22518de4abfbd5b2fc38b3ec1fa638494 (diff)
downloadgit-9951d3b37ec7298384640b11d07a990ef031fe83.tar.gz
setup: clean up setup_discovered_git_dir()
If core.bare is true, discard the discovered worktree, move back to original cwd. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/setup.c b/setup.c
index a6cc044730..3ee9c2eec8 100644
--- a/setup.c
+++ b/setup.c
@@ -362,39 +362,27 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
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;
- }
- if (is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT)) {
- *gitfile_dirp = DEFAULT_GIT_DIR_ENVIRONMENT;
- return 1;
- }
- return 0;
-}
+ if (check_repository_format_gently(gitdir, nongit_ok))
+ return NULL;
-static const char *setup_discovered_git_dir(const char *work_tree_env,
- const char *gitdir,
- int offset, int len,
- char *cwd, int *nongit_ok)
-{
- int root_len;
- char *work_tree;
+ /* #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);
- work_tree = xstrndup(cwd, offset > root_len ? offset : root_len);
- set_git_work_tree(work_tree);
- free(work_tree);
- if (check_repository_format_gently(gitdir, nongit_ok))
- return NULL;
+ inside_work_tree = 1;
if (offset == len)
return NULL;
@@ -456,8 +444,8 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
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;
@@ -502,11 +490,23 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
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,
- gitfile_dir,
- 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(cwd, offset, len, nongit_ok);