summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-12-14 22:10:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-15 00:43:39 (GMT)
commit8befc50c49e8a271fd3cd7fb34258fe88d1dfcad (patch)
treeacbc3709da13aa2898a7a35fe24c3d45be6d8738 /config.c
parent390c3480b2bcdc5c254db1a81ff163d7f7061f40 (diff)
downloadgit-8befc50c49e8a271fd3cd7fb34258fe88d1dfcad.zip
git-8befc50c49e8a271fd3cd7fb34258fe88d1dfcad.tar.gz
git-8befc50c49e8a271fd3cd7fb34258fe88d1dfcad.tar.bz2
Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3
In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/config.c b/config.c
index d2fc8f5..790405a 100644
--- a/config.c
+++ b/config.c
@@ -636,10 +636,7 @@ int git_config(config_fn_t fn, void *data)
char *repo_config = NULL;
const char *home = NULL;
- /* $GIT_CONFIG makes git read _only_ the given config file,
- * $GIT_CONFIG_LOCAL will make it process it in addition to the
- * global config file, the same way it would the per-repository
- * config file otherwise. */
+ /* Setting $GIT_CONFIG makes git read _only_ the given config file. */
if (config_exclusive_filename)
return git_config_from_file(fn, config_exclusive_filename, data);
if (git_config_system() && !access(git_etc_gitconfig(), R_OK))