Add support for GIT_ONE_FILESYSTEM
This patch makes git pay attention to the GIT_ONE_FILESYSTEM environment variable. When that variable is set, git will stop searching for a GIT_DIR when it attempts to cross a filesystem boundary. When working in an environment with too many automount points to make maintaining a GIT_CEILING_DIRECTORIES list enjoyable, GIT_ONE_FILESYSTEM gives the option of turning all such attempts off with one setting. Signed-off-by: Lars R. Damerow <lars@pixar.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
502ffe3491
commit
8030e44215
25
setup.c
25
setup.c
@ -323,6 +323,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
|
||||
const char *gitdirenv;
|
||||
const char *gitfile_dir;
|
||||
int len, offset, ceil_offset, root_len;
|
||||
int current_device = 0, one_filesystem = 0;
|
||||
struct stat buf;
|
||||
|
||||
/*
|
||||
* Let's assume that we are in a git repository.
|
||||
@ -390,6 +392,12 @@ const char *setup_git_directory_gently(int *nongit_ok)
|
||||
* etc.
|
||||
*/
|
||||
offset = len = strlen(cwd);
|
||||
one_filesystem = git_env_bool("GIT_ONE_FILESYSTEM", 0);
|
||||
if (one_filesystem) {
|
||||
if (stat(".", &buf))
|
||||
die_errno("failed to stat '.'");
|
||||
current_device = buf.st_dev;
|
||||
}
|
||||
for (;;) {
|
||||
gitfile_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
|
||||
if (gitfile_dir) {
|
||||
@ -422,6 +430,23 @@ const char *setup_git_directory_gently(int *nongit_ok)
|
||||
}
|
||||
die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
|
||||
}
|
||||
if (one_filesystem) {
|
||||
if (stat("..", &buf)) {
|
||||
cwd[offset] = '\0';
|
||||
die_errno("failed to stat '%s/..'", cwd);
|
||||
}
|
||||
if (buf.st_dev != current_device) {
|
||||
if (nongit_ok) {
|
||||
if (chdir(cwd))
|
||||
die_errno("Cannot come back to cwd");
|
||||
*nongit_ok = 1;
|
||||
return NULL;
|
||||
}
|
||||
cwd[offset] = '\0';
|
||||
die("Not a git repository (or any parent up to mount parent %s)\n"
|
||||
"Stopping at filesystem boundary since GIT_ONE_FILESYSTEM is set.", cwd);
|
||||
}
|
||||
}
|
||||
if (chdir("..")) {
|
||||
cwd[offset] = '\0';
|
||||
die_errno("Cannot change to '%s/..'", cwd);
|
||||
|
Reference in New Issue
Block a user