Merge branch 'by/blame-doc-m-c'

[git.git] / setup.c

diff --git a/setup.c b/setup.c
index d29063349052757b9e57ed1312fd073399161393..5a083fa77dda016d0f3f511787ebf771aaf1be08 100644 (file)
--- 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("..")) {