summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git.txt10
-rw-r--r--setup.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index aa62083..991aaec 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -530,15 +530,15 @@ git so take care if using Cogito etc.
a GIT_DIR set on the command line or in the environment.
(Useful for excluding slow-loading network directories.)
-'GIT_ONE_FILESYSTEM'::
+'GIT_DISCOVERY_ACROSS_FILESYSTEM'::
When run in a directory that does not have ".git" repository
directory, git tries to find such a directory in the parent
directories to find the top of the working tree, but by default it
does not cross filesystem boundaries. This environment variable
- can be set to false value ("false" or zero) to tell git not to
- stop at filesystem boundaries. Like 'GIT_CEILING_DIRECTORIES',
- this will not affect an explicit respository directory set via
- 'GIT_DIR' or on the command line.
+ can be set to true to tell git not to stop at filesystem
+ boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect
+ an explicit repository directory set via 'GIT_DIR' or on the
+ command line.
git Commits
~~~~~~~~~~~
diff --git a/setup.c b/setup.c
index d290633..5a083fa 100644
--- a/setup.c
+++ b/setup.c
@@ -392,7 +392,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
* etc.
*/
offset = len = strlen(cwd);
- one_filesystem = git_env_bool("GIT_ONE_FILESYSTEM", 0);
+ one_filesystem = !git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0);
if (one_filesystem) {
if (stat(".", &buf))
die_errno("failed to stat '.'");
@@ -444,7 +444,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
}
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 true.", cwd);
+ "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).", cwd);
}
}
if (chdir("..")) {