diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-04 14:49:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-04 15:55:29 -0700 |
| commit | cf87463e79a3018f666bfc9af113d3eea58a3d82 (patch) | |
| tree | 9ef6d870995ed8c15d9a1c3b4223c89e6ac05ee3 | |
| parent | e640551773c9730a47779dfc93155feb092c8e3c (diff) | |
| download | git-cf87463e79a3018f666bfc9af113d3eea58a3d82.tar.gz git-cf87463e79a3018f666bfc9af113d3eea58a3d82.tar.xz | |
Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
If a missing ONE_FILESYSTEM defaults to true, the only users who set this
variable set it to false to tell git not to limit the discovery to one
filesystem; there are too many negations in one sentence to make a simple
panda brain dizzy.
Use the variable GIT_DISCOVERY_ACROSS_FILESYSTEM that changes the
behaviour from the default "limit to one filesystem" to "cross the
boundary as I ask you to"; makes the semantics much more straight
forward.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git.txt | 10 | ||||
| -rw-r--r-- | setup.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index aa6208320..991aaec59 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 ~~~~~~~~~~~ @@ -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("..")) { |