Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/git-svn.perl b/git-svn.perl
index 2c206e917859be5870e0e94a6c4a99507c8dd413..ad01e182df8abbeac7efa3db0d84d55ab1563e40 100755 (executable)
--- 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 <<EOF;
 The following [svn-remote] sections in your config file ($file) are empty
 and can be safely removed: