summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-06-20 07:45:53 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 08:21:51 (GMT)
commit92a28be0ce12a50e0e53268be99130c2ef504c7e (patch)
tree140816e7dcfb21db5cba07c71ca2cd085cb1df34
parent5f1a63e0efc750c54a25644a36cf2905495a9b93 (diff)
downloadgit-92a28be0ce12a50e0e53268be99130c2ef504c7e.zip
git-92a28be0ce12a50e0e53268be99130c2ef504c7e.tar.gz
git-92a28be0ce12a50e0e53268be99130c2ef504c7e.tar.bz2
repo-config: Fix late-night bug
This bug was hidden by the "future-proofing" of the test. Sigh. When neither GIT_CONFIG nor GIT_CONFIG_LOCAL is set, do not use NULL, but $GIT_DIR/config. Instead of using $GIT_DIR/config when only GIT_CONFIG_LOCAL is set. Sorry. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--repo-config.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/repo-config.c b/repo-config.c
index 03f108f..ab8f1af 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));