Merge branch 'jc/subdir'

diff --git a/setup.c b/setup.c
index bde590f7cc8ce3a6b218d22c81497da1159ac825..d3556edf121ba78b0b83d20fdbd9cb397e79eb2b 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -131,7 +131,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                if (validate_symref(path))
                        goto bad_dir_environ;
                if (getenv(DB_ENVIRONMENT)) {
-                       if (access(DB_ENVIRONMENT, X_OK))
+                       if (access(getenv(DB_ENVIRONMENT), X_OK))
                                goto bad_dir_environ;
                }
                else {