From 8befc50c49e8a271fd3cd7fb34258fe88d1dfcad Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 14 Dec 2008 23:10:52 +0100 Subject: [PATCH] Get rid of the last remnants of GIT_CONFIG_LOCAL 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 Signed-off-by: Junio C Hamano --- config.c | 5 +---- git-svn.perl | 3 +-- t/t5400-send-pack.sh | 2 +- t/test-lib.sh | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/config.c b/config.c index d2fc8f5f22..790405a213 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)) diff --git a/git-svn.perl b/git-svn.perl index 2c206e9178..ad01e182df 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -5015,8 +5015,7 @@ sub minimize_connections { } } if (@emptied) { - my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} || - "$ENV{GIT_DIR}/config"; + my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config"; print STDERR <