Merge branch 'js/maint-stash-index-copy'

[thirdparty/git.git] / config.c

diff --git a/config.c b/config.c
index fa740a6a60a49512b613f70add97d445f622afd2..e28197a3f64cb8672f8aeef26cc0402c7c22548d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -825,11 +825,6 @@ int git_config_system(void)
        return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
 }
 
-int git_config_global(void)
-{
-       return !git_env_bool("GIT_CONFIG_NOGLOBAL", 0);
-}
-
 int git_config_from_parameters(config_fn_t fn, void *data)
 {
        static int loaded_environment;
@@ -861,7 +856,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
        }
 
        home = getenv("HOME");
-       if (git_config_global() && home) {
+       if (home) {
                char *user_config = xstrdup(mkpath("%s/.gitconfig", home));
                if (!access(user_config, R_OK)) {
                        ret += git_config_from_file(fn, user_config, data);