Skip to content

Commit

Permalink
git-svn: use ~/.subversion config files when using SVN:: libraries
Browse files Browse the repository at this point in the history
This allows users to use HTTP proxy information (among other settings)
from ~/.subversion/servers and ~/.subversion/config

--config-dir (as before) may be passed to git-svn to override the
default choice of '~/.subversion' for the configuration directory.

Thanks to tko on #git for pointing this out.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Nov 27, 2006
1 parent 8832919 commit 6f23ebf
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -2822,7 +2822,9 @@ sub libsvn_connect {
SVN::Client::get_username_prompt_provider(
\&_username_prompt, 2),
]);
my $config = SVN::Core::config_get_config($_config_dir);
my $ra = SVN::Ra->new(url => $url, auth => $baton,
config => $config,
pool => SVN::Pool->new,
auth_provider_callbacks => $callbacks);
$ra->{svn_path} = $url;
Expand All @@ -2834,8 +2836,8 @@ sub libsvn_connect {

sub libsvn_dup_ra {
my ($ra) = @_;
SVN::Ra->new(map { $_ => $ra->{$_} }
qw/url auth auth_provider_callbacks repos_root svn_path/);
SVN::Ra->new(map { $_ => $ra->{$_} } qw/config url
auth auth_provider_callbacks repos_root svn_path/);
}

sub libsvn_get_file {
Expand Down

0 comments on commit 6f23ebf

Please sign in to comment.