aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-01 15:14:23 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-01 15:14:23 -0800
commit6d579a0de63157b771958c30c0d8a28cfafa7574 (patch)
tree6de549ef3881bcb2bb5d98fdd1509789bd56bc41
parent701fa7fe35768fd6e291b667566ac4b434f6e1c9 (diff)
parent0b6641557ccfdbd855c88b7980c1a24224b83c74 (diff)
downloadgit-6d579a0de63157b771958c30c0d8a28cfafa7574.tar.gz
git-6d579a0de63157b771958c30c0d8a28cfafa7574.tar.xz
Merge branch 'ew/svn-1.9.0-auth'
* ew/svn-1.9.0-auth: git-svn: fix auth parameter handling on SVN 1.9.0+
-rw-r--r--perl/Git/SVN/Ra.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 4a499fcb3..e76469680 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -81,7 +81,6 @@ sub prepare_config_once {
SVN::_Core::svn_config_ensure($config_dir, undef);
my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
my $config = SVN::Core::config_get_config($config_dir);
- my $dont_store_passwords = 1;
my $conf_t = $config->{'config'};
no warnings 'once';
@@ -93,9 +92,14 @@ sub prepare_config_once {
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,
$SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
1) == 0) {
+ my $val = '1';
+ if (::compare_svn_version('1.9.0') < 0) { # pre-SVN r1553823
+ my $dont_store_passwords = 1;
+ $val = bless \$dont_store_passwords, "_p_void";
+ }
SVN::_Core::svn_auth_set_parameter($baton,
$SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
- bless (\$dont_store_passwords, "_p_void"));
+ $val);
}
if (SVN::_Core::svn_config_get_bool($conf_t,
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,