diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-29 17:00:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-29 17:00:42 -0700 |
| commit | 4b2a0f820c32d40f2d58cf2551469290b725248d (patch) | |
| tree | 9aad6c74c78a758f3dc916436110f474b9779aae | |
| parent | 62bc83349d52be49b037d2c800a7f4064cfbc5b5 (diff) | |
| parent | 082afee621aeb2d3746c8ae290af98823f981f34 (diff) | |
| download | git-4b2a0f820c32d40f2d58cf2551469290b725248d.tar.gz git-4b2a0f820c32d40f2d58cf2551469290b725248d.tar.xz | |
Merge git://git.bogomips.org/git-svn
By Matthijs Kooijman
via Eric Wong
* git://git.bogomips.org/git-svn:
git-svn: use platform specific auth providers
| -rwxr-xr-x | git-svn.perl | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index f8e9ef0ea..427da9e7a 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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 @@ sub _auth_providers () { \&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 { |