Skip to content

Commit 6d579a0

Browse files
committed
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+
2 parents 701fa7f + 0b66415 commit 6d579a0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

perl/Git/SVN/Ra.pm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ sub prepare_config_once {
8181
SVN::_Core::svn_config_ensure($config_dir, undef);
8282
my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
8383
my $config = SVN::Core::config_get_config($config_dir);
84-
my $dont_store_passwords = 1;
8584
my $conf_t = $config->{'config'};
8685

8786
no warnings 'once';
@@ -93,9 +92,14 @@ sub prepare_config_once {
9392
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,
9493
$SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
9594
1) == 0) {
95+
my $val = '1';
96+
if (::compare_svn_version('1.9.0') < 0) { # pre-SVN r1553823
97+
my $dont_store_passwords = 1;
98+
$val = bless \$dont_store_passwords, "_p_void";
99+
}
96100
SVN::_Core::svn_auth_set_parameter($baton,
97101
$SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
98-
bless (\$dont_store_passwords, "_p_void"));
102+
$val);
99103
}
100104
if (SVN::_Core::svn_config_get_bool($conf_t,
101105
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,

0 commit comments

Comments
 (0)