Merge branch 'lt/case-insensitive'

diff --git a/environment.c b/environment.c
index 3c816824299cc82d3ed54782357aa1cf49346120..945574169b75ae1f0f0efad847d863104c1da3d1 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -50,6 +50,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);