undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of the last remnants of GIT_CONFIG_LOCAL

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2008-12-14 23:10:52 +01:00 committed by Junio C Hamano
parent 390c3480b2
commit 8befc50c49
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.c
View File

@ -636,10 +636,7 @@ int git_config(config_fn_t fn, void *data)
char *repo_config = NULL; char *repo_config = NULL;
const char *home = NULL; const char *home = NULL;
/* $GIT_CONFIG makes git read _only_ the given config file, /* Setting $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. */
if (config_exclusive_filename) if (config_exclusive_filename)
return git_config_from_file(fn, config_exclusive_filename, data); return git_config_from_file(fn, config_exclusive_filename, data);
if (git_config_system() && !access(git_etc_gitconfig(), R_OK)) if (git_config_system() && !access(git_etc_gitconfig(), R_OK))

3
git-svn.perl
View File

@ -5015,8 +5015,7 @@ sub minimize_connections {
} }
} }
if (@emptied) { if (@emptied) {
my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} || my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config";
"$ENV{GIT_DIR}/config";
print STDERR <<EOF; print STDERR <<EOF;
The following [svn-remote] sections in your config file ($file) are empty The following [svn-remote] sections in your config file ($file) are empty
and can be safely removed: and can be safely removed:

2
t/t5400-send-pack.sh
View File

@ -99,7 +99,7 @@ test_expect_success \
! test -f victim/.git/refs/heads/extra ! test -f victim/.git/refs/heads/extra
' '
unset GIT_CONFIG GIT_CONFIG_LOCAL unset GIT_CONFIG
HOME=`pwd`/no-such-directory HOME=`pwd`/no-such-directory
export HOME ;# this way we force the victim/.git/config to be used. export HOME ;# this way we force the victim/.git/config to be used.

1
t/test-lib.sh
View File

@ -471,7 +471,6 @@ PATH=$TEST_DIRECTORY/..:$PATH
GIT_EXEC_PATH=$(pwd)/.. GIT_EXEC_PATH=$(pwd)/..
GIT_TEMPLATE_DIR=$(pwd)/../templates/blt GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
unset GIT_CONFIG unset GIT_CONFIG
unset GIT_CONFIG_LOCAL
GIT_CONFIG_NOSYSTEM=1 GIT_CONFIG_NOSYSTEM=1
GIT_CONFIG_NOGLOBAL=1 GIT_CONFIG_NOGLOBAL=1
export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL