Merge branch 'cc/help'

diff --git a/environment.c b/environment.c
index 6739a3f41745fe1c01dc767e09af8746d6f2815f..fcd1ee5ef8c0999fce0095a2d6a792e5d221c50a 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -49,6 +49,8 @@ static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
 static void setup_git_env(void)
 {
        git_dir = getenv(GIT_DIR_ENVIRONMENT);
+       if (!git_dir)
+               git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
        if (!git_dir)
                git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
        git_object_dir = getenv(DB_ENVIRONMENT);