Merge branch 'ml/mailmap' into maint-1.7.6

diff --git a/environment.c b/environment.c
index 94d58fd24413ec1d1a5769029bd5149b609f0d4e..2228c4e9a14ed6b1b936c838b52f66909429d9d2 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -91,7 +91,7 @@ static void setup_git_env(void)
        git_dir = getenv(GIT_DIR_ENVIRONMENT);
        git_dir = git_dir ? xstrdup(git_dir) : NULL;
        if (!git_dir) {
-               git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+               git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);
                git_dir = git_dir ? xstrdup(git_dir) : NULL;
        }
        if (!git_dir)