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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Dec 14, 2008 at 23:10 UTC
8befc50c49e8a271fd3cd7fb34258fe88d1dfcad
4 files changed
+3
-8
config.c
+1
-4
@@ -636,10 +636,7 @@ int git_config(config_fn_t fn, void *data)
636
char *repo_config = NULL;
637
const char *home = NULL;
638
639
- /* $GIT_CONFIG makes git read _only_ the given config file,
640
- * $GIT_CONFIG_LOCAL will make it process it in addition to the
641
- * global config file, the same way it would the per-repository
642
- * config file otherwise. */
639
+ /* Setting $GIT_CONFIG makes git read _only_ the given config file. */
640
if (config_exclusive_filename)
641
return git_config_from_file(fn, config_exclusive_filename, data);
642
if (git_config_system() && !access(git_etc_gitconfig(), R_OK))
git-svn.perl
+1
-2
@@ -5015,8 +5015,7 @@ sub minimize_connections {
5015
}
5016
}
5017
if (@emptied) {
5018
- my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||
5019
- "$ENV{GIT_DIR}/config";
5018
+ my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config";
5019
print STDERR <<EOF;
5020
The following [svn-remote] sections in your config file ($file) are empty
5021
and can be safely removed:
t/t5400-send-pack.sh
+1
-1
@@ -99,7 +99,7 @@ test_expect_success \
99
! test -f victim/.git/refs/heads/extra
100
'
101
102
-unset GIT_CONFIG GIT_CONFIG_LOCAL
102
+unset GIT_CONFIG
103
HOME=`pwd`/no-such-directory
104
export HOME ;# this way we force the victim/.git/config to be used.
105
t/test-lib.sh
-1
@@ -471,7 +471,6 @@ PATH=$TEST_DIRECTORY/..:$PATH
471
GIT_EXEC_PATH=$(pwd)/..
472
GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
473
unset GIT_CONFIG
474
-unset GIT_CONFIG_LOCAL
474
GIT_CONFIG_NOSYSTEM=1
475
GIT_CONFIG_NOGLOBAL=1
476
export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL