undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do check_repository_format() early

Browse Source 
Repository version check is only performed when
setup_git_directory() is called. This makes sure
setup_git_directory_gently() does the check too.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2007-11-29 19:21:39 +07:00 committed by Junio C Hamano
parent 1e8a195451
commit 138dd1e990
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup.c
View File

@ -230,8 +230,14 @@ const char *setup_git_directory_gently(int *nongit_ok)
static char buffer[1024 + 1]; static char buffer[1024 + 1];
const char *retval; const char *retval;
if (!work_tree_env) if (!work_tree_env) {
return set_work_tree(gitdirenv); retval = set_work_tree(gitdirenv);
/* config may override worktree
* see set_work_tree comment */
check_repository_format();
return retval;
}
check_repository_format();
retval = get_relative_cwd(buffer, sizeof(buffer) - 1, retval = get_relative_cwd(buffer, sizeof(buffer) - 1,
get_git_work_tree()); get_git_work_tree());
if (!retval || !*retval) if (!retval || !*retval)
@ -271,6 +277,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
if (!work_tree_env) if (!work_tree_env)
inside_work_tree = 0; inside_work_tree = 0;
setenv(GIT_DIR_ENVIRONMENT, ".", 1); setenv(GIT_DIR_ENVIRONMENT, ".", 1);
check_repository_format();
return NULL; return NULL;
} }
chdir(".."); chdir("..");
@ -291,6 +298,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
if (!work_tree_env) if (!work_tree_env)
inside_work_tree = 1; inside_work_tree = 1;
git_work_tree_cfg = xstrndup(cwd, offset); git_work_tree_cfg = xstrndup(cwd, offset);
check_repository_format();
if (offset == len) if (offset == len)
return NULL; return NULL;
@ -351,7 +359,6 @@ int check_repository_format(void)
const char *setup_git_directory(void) const char *setup_git_directory(void)
{ {
const char *retval = setup_git_directory_gently(NULL); const char *retval = setup_git_directory_gently(NULL);
check_repository_format();
/* If the work tree is not the default one, recompute prefix */ /* If the work tree is not the default one, recompute prefix */
if (inside_work_tree < 0) { if (inside_work_tree < 0) {