mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup: split off a function to handle ordinary .git directories

Browse Source 
Finish the clean-up of setup_git_directory_gently() by splitting the
last case of validation+setup (global variables, prefix, check_format,
set_git_dir) into its own function.  Now setup_git_git_directory_gently
itself takes care of discovery only and the functions that pick up
from there are nearby in the source file so they can be easily
compared.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2010-07-24 07:11:58 -05:00
committed by Junio C Hamano
parent 3f8099fce7
commit 98937bef1b
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
setup.c
View File

@ -360,6 +360,28 @@ static int cwd_contains_git_dir(const char **gitfile_dirp)
return is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT); return is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT);
} }
static const char *setup_discovered_git_dir(const char *work_tree_env,
int offset, int len, char *cwd, int *nongit_ok)
{
int root_len;
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;
if (offset == len)
return NULL;
/* Make "offset" point to past the '/', and add a '/' at the end */
offset++;
cwd[len++] = '/';
cwd[len] = 0;
return cwd + offset;
}
static const char *setup_bare_git_dir(const char *work_tree_env, static const char *setup_bare_git_dir(const char *work_tree_env,
int offset, int len, char *cwd, int *nongit_ok) int offset, int len, char *cwd, int *nongit_ok)
{ {
@ -411,7 +433,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
static char cwd[PATH_MAX+1]; static char cwd[PATH_MAX+1];
const char *gitdirenv; const char *gitdirenv;
const char *gitfile_dir; const char *gitfile_dir;
int len, offset, ceil_offset, root_len; int len, offset, ceil_offset;
dev_t current_device = 0; dev_t current_device = 0;
int one_filesystem = 1; int one_filesystem = 1;
@ -456,7 +478,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
current_device = get_device_or_die(".", NULL); current_device = get_device_or_die(".", NULL);
for (;;) { for (;;) {
if (cwd_contains_git_dir(&gitfile_dir)) if (cwd_contains_git_dir(&gitfile_dir))
break; return setup_discovered_git_dir(work_tree_env, offset,
len, cwd, nongit_ok);
if (is_git_directory(".")) if (is_git_directory("."))
return setup_bare_git_dir(work_tree_env, offset, return setup_bare_git_dir(work_tree_env, offset,
len, cwd, nongit_ok); len, cwd, nongit_ok);
@ -482,22 +505,6 @@ const char *setup_git_directory_gently(int *nongit_ok)
die_errno("Cannot change to '%s/..'", cwd); die_errno("Cannot change to '%s/..'", cwd);
} }
} }
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;
if (offset == len)
return NULL;
/* Make "offset" point to past the '/', and add a '/' at the end */
offset++;
cwd[len++] = '/';
cwd[len] = 0;
return cwd + offset;
} }
int git_config_perm(const char *var, const char *value) int git_config_perm(const char *var, const char *value)