[PATCH 1/2] git-svn: use platform specific auth providers
From: Matthijs Kooijman <hidden>
Date: 2016-06-15 22:53:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/2] git-svn: use platform specific auth providers · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git-svn: use platform specific auth providers · Eric Wong <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git-svn: use platform specific auth providers · Charles Bailey <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git-svn: use platform specific auth providers · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git-svn: use platform specific auth providers · Matthijs Kooijman <hidden>
On Linux, this makes authentication using passwords from gnome-keyring and kwallet work (only the former was tested). On Mac OS X, this allows using the OS X Keychain. --- git-svn.perl | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 4334b95..1790d10 100755
--- a/git-svn.perl
+++ b/git-svn.perl@@ -5436,7 +5436,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(
@@ -5452,7 +5452,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 {
--
1.7.10