Add missing inside_work_tree setting in setup_git_directory_gently
When both GIT_DIR and GIT_WORK_TREE are set, and setup_git_directory_gently() changes the current working directory accordingly, it should also set inside_work_tree = 1. Without this, work_tree handling code in setup_git_directory() will be activated. If you stay in root work tree (no prefix), it does not harm. It does if you work from a subdirectory though. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ee787400de
commit
1e8a195451
1
setup.c
1
setup.c
@ -240,6 +240,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
|
|||||||
if (chdir(work_tree_env) < 0)
|
if (chdir(work_tree_env) < 0)
|
||||||
die ("Could not chdir to %s", work_tree_env);
|
die ("Could not chdir to %s", work_tree_env);
|
||||||
strcat(buffer, "/");
|
strcat(buffer, "/");
|
||||||
|
inside_work_tree = 1;
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
if (nongit_ok) {
|
if (nongit_ok) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user