Merge branch 'pb/config' into next

git-mirror · Jun 20, 2006 · 9e37f72 · 9e37f72
2 parents 592689c + e33d061
commit 9e37f72
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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));