{"thread":{"id":"16730","subject":"[PATCH] Get rid of the last remnants of GIT_CONFIG_LOCAL","startedAt":"2008-12-14T22:10:52Z","lastAt":"2008-12-17T15:53:09Z","messageCount":5,"participants":["Johannes Schindelin","Junio C Hamano","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"97894","messageId":"alpine.DEB.1.00.0812142310210.25197@racer","threadId":"16730","inReplyTo":null,"subject":"[PATCH] Get rid of the last remnants of GIT_CONFIG_LOCAL","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-12-14T22:10:52Z","receivedAt":"2008-12-14T22:10:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nIn dc871831(Only use GIT_CONFIG in \"git config\", not other programs),\nGIT_CONFIG_LOCAL was rested in peace, in favor of not reading\n/etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n config.c             |    5 +----\n git-svn.perl         |    3 +--\n t/t5400-send-pack.sh |    2 +-\n t/test-lib.sh        |    1 -\n 4 files changed, 3 insertions(+), 8 deletions(-)\n\ndiff --git a/config.c b/config.c\nindex 8bd6106..8ff2b4b 100644\n--- a/config.c\n+++ b/config.c\n@@ -640,10 +640,7 @@ int git_config(config_fn_t fn, void *data)\n \tchar *repo_config = NULL;\n \tconst char *home = NULL;\n \n-\t/* $GIT_CONFIG makes git read _only_ the given config file,\n-\t * $GIT_CONFIG_LOCAL will make it process it in addition to the\n-\t * global config file, the same way it would the per-repository\n-\t * config file otherwise. */\n+\t/* Setting $GIT_CONFIG makes git read _only_ the given config file. */\n \tif (config_exclusive_filename)\n \t\treturn git_config_from_file(fn, config_exclusive_filename, data);\n \tif (git_config_system() && !access(git_etc_gitconfig(), R_OK))\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 914c707..efda5c1 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -5007,8 +5007,7 @@ sub minimize_connections {\n \t\t}\n \t}\n \tif (@emptied) {\n-\t\tmy $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||\n-\t\t           \"$ENV{GIT_DIR}/config\";\n+\t\tmy $file = $ENV{GIT_CONFIG} || \"$ENV{GIT_DIR}/config\";\n \t\tprint STDERR <<EOF;\n The following [svn-remote] sections in your config file ($file) are empty\n and can be safely removed:\ndiff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh\nindex da69f08..b21317d 100755\n--- a/t/t5400-send-pack.sh\n+++ b/t/t5400-send-pack.sh\n@@ -99,7 +99,7 @@ test_expect_success \\\n \t! test -f victim/.git/refs/heads/extra\n '\n \n-unset GIT_CONFIG GIT_CONFIG_LOCAL\n+unset GIT_CONFIG\n HOME=`pwd`/no-such-directory\n export HOME ;# this way we force the victim/.git/config to be used.\n \ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 8936173..22ed448 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -471,7 +471,6 @@ PATH=$TEST_DIRECTORY/..:$PATH\n GIT_EXEC_PATH=$(pwd)/..\n GIT_TEMPLATE_DIR=$(pwd)/../templates/blt\n unset GIT_CONFIG\n-unset GIT_CONFIG_LOCAL\n GIT_CONFIG_NOSYSTEM=1\n GIT_CONFIG_NOGLOBAL=1\n export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL\n-- \n1.6.0.4.1189.g8876f\n"},{"id":"97895","messageId":"alpine.DEB.1.00.0812142311360.25197@racer","threadId":"16730","inReplyTo":"alpine.DEB.1.00.0812142310210.25197@racer","subject":"[PATCH] git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-12-14T22:12:49Z","receivedAt":"2008-12-14T22:12:49Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nIn dc871831(Only use GIT_CONFIG in \"git config\", not other programs),\nGIT_CONFIG_LOCAL was rested in peace, in favor of not reading\n/etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tYou might want to hold off on that, as git-gui is supposed to be \n\tless tightly coupled to git.git than, say, git-svn.\n\n\tThe commit removing support for GIT_CONFIG_LOCAL is from Mon Jun \n\t30 03:37:47 2008 -0400...\n\n git-gui.sh |    1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 8a4b42d..bab66bd 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -3315,7 +3315,6 @@ by %s:\n \t\t{^GIT_PAGER$} -\n \t\t{^GIT_TRACE$} -\n \t\t{^GIT_CONFIG$} -\n-\t\t{^GIT_CONFIG_LOCAL$} -\n \t\t{^GIT_(AUTHOR|COMMITTER)_DATE$} {\n \t\t\tappend msg \" - $name\\n\"\n \t\t\tincr ignored_env\n-- \n1.6.0.4.1189.g8876f\n"},{"id":"97911","messageId":"7vd4fu1d4w.fsf@gitster.siamese.dyndns.org","threadId":"16730","inReplyTo":"alpine.DEB.1.00.0812142310210.25197@racer","subject":"Re: [PATCH] Get rid of the last remnants of GIT_CONFIG_LOCAL","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-12-15T00:43:43Z","receivedAt":"2008-12-15T00:43:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"},{"id":"97938","messageId":"alpine.DEB.1.00.0812151035340.14632@racer","threadId":"16730","inReplyTo":"7vd4fu1d4w.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Get rid of the last remnants of GIT_CONFIG_LOCAL","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-12-15T09:35:57Z","receivedAt":"2008-12-15T09:35:57Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 14 Dec 2008, Junio C Hamano wrote:\n\n> Thanks.\n\nHeh, am I that rare a contributor now that you start to thank me for my \npatches? ;-)\n\nCiao,\nDscho\n"},{"id":"98148","messageId":"20081217155309.GA32487@spearce.org","threadId":"16730","inReplyTo":"alpine.DEB.1.00.0812142311360.25197@racer","subject":"Re: [PATCH] git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-12-17T15:53:09Z","receivedAt":"2008-12-17T15:53:09Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> \n> In dc871831(Only use GIT_CONFIG in \"git config\", not other programs),\n> GIT_CONFIG_LOCAL was rested in peace, in favor of not reading\n> /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set.\n> \n> \tYou might want to hold off on that, as git-gui is supposed to be \n> \tless tightly coupled to git.git than, say, git-svn.\n> \n> \tThe commit removing support for GIT_CONFIG_LOCAL is from Mon Jun \n> \t30 03:37:47 2008 -0400...\n\nNah, that's in Git 1.6.0.  This block of code is only useful on\nWindows, where most people are probably running a more msysgit\nstyle system than some random mashup of Git and git-gui versions.\n\nPlus, wasn't there just some discussion about how this warning\nis perhaps harmful to the user because it doesn't really help\nher to resolve the problem?\n\nI applied it anyway.  Its quite unlikely anyone runs git-gui on\nWindows with GIT_CONFIG_LOCAL in their environment.\n\n-- \nShawn.\n"}]}