From: Junio C Hamano <junkio@cox.net>
Date: Tue, 20 Jun 2006 09:39:48 +0000 (-0700)
Subject: Merge branch 'pb/config' into next
X-Git-Tag: v1.4.1-rc1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9e37f72afe49c133bfc54b17b659b2ae6f189b7f?hp=592689c46187165d80ab35c9090404b7ee248dbb

Merge branch 'pb/config' into next
---

diff --git a/config.c b/config.c
index d064f429cb..3e077d4c6c 100644
--- a/config.c
+++ b/config.c
@@ -335,7 +335,7 @@ int git_config(config_fn_t fn)
 
 	if (home) {
 		char *user_config = strdup(mkpath("%s/.gitconfig", home));
-		if (access(user_config, R_OK) > 0)
+		if (!access(user_config, R_OK))
 			ret = git_config_from_file(fn, user_config);
 		free(user_config);
 	}
diff --git a/repo-config.c b/repo-config.c
index 03f108fe2f..ab8f1afeea 100644
--- a/repo-config.c
+++ b/repo-config.c
@@ -74,8 +74,6 @@ static int get_value(const char* key_, const char* regex_)
 		const char *home = getenv("HOME");
 		local = getenv("GIT_CONFIG_LOCAL");
 		if (!local)
-			local = repo_config;
-		else
 			local = repo_config = strdup(git_path("config"));
 		if (home)
 			global = strdup(mkpath("%s/.gitconfig", home));