Merge branch 'kk/maint-gitweb-missing-owner'

diff --git a/git-svn.perl b/git-svn.perl
index aa14564e337adfd7646bc61692c4c4734d8dbfdd..427da9e7a1a10ad9949eaa0c97d7fd0aa3436c3e 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4070,7 +4070,7 @@ sub rev_map_set {
        if ($update_ref) {
                $sigmask = POSIX::SigSet->new();
                my $signew = POSIX::SigSet->new(SIGINT, SIGHUP, SIGTERM,
-                       SIGALRM, SIGPIPE, SIGUSR1, SIGUSR2);
+                       SIGALRM, SIGUSR1, SIGUSR2);
                sigprocmask(SIG_BLOCK, $signew, $sigmask) or
                        croak "Can't block signals: $!";
        }
@@ -5444,7 +5444,7 @@ BEGIN
 }
 
 sub _auth_providers () {
-       [
+       my @rv = (
          SVN::Client::get_simple_provider(),
          SVN::Client::get_ssl_server_trust_file_provider(),
          SVN::Client::get_simple_prompt_provider(
@@ -5460,7 +5460,23 @@ ()
            \&Git::SVN::Prompt::ssl_server_trust),
          SVN::Client::get_username_prompt_provider(
            \&Git::SVN::Prompt::username, 2)
-       ]
+       );
+
+       # earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
+       # this function
+       if ($SVN::Core::VERSION gt '1.6.12') {
+               my $config = SVN::Core::config_get_config($config_dir);
+               my ($p, @a);
+               # config_get_config returns all config files from
+               # ~/.subversion, auth_get_platform_specific_client_providers
+               # just wants the config "file".
+               @a = ($config->{'config'}, undef);
+               $p = SVN::Core::auth_get_platform_specific_client_providers(@a);
+               # Insert the return value from
+               # auth_get_platform_specific_providers
+               unshift @rv, @$p;
+       }
+       \@rv;
 }
 
 sub escape_uri_only {