Skip to content

Commit ce91fc6

Browse files
Eric WongJunio C Hamano
authored andcommitted
git-svn: fix commits over svn+ssh://
Once a get_commit_editor has been called from an SVN session, RA layer operations are not allowed (well, unless you're using file:// or http(s)://). So we'll pass an alternate SVN::Ra object to our editor object for running 'check-path'. This should fix commits over svnserve (svn:// without ssh, too). Closes Debian bug #392702, thanks to Pierre Habouzit for reporting the bug. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 4035b46 commit ce91fc6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-svn.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ sub commit_lib {
536536
$SVN = libsvn_connect($repo);
537537
my $ed = SVN::Git::Editor->new(
538538
{ r => $r_last,
539-
ra => $SVN,
539+
ra => $SVN_LOG,
540540
c => $c,
541541
svn_path => $SVN_PATH
542542
},
@@ -832,7 +832,7 @@ sub commit_diff {
832832
$SVN ||= libsvn_connect($repo);
833833
my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
834834
my $ed = SVN::Git::Editor->new({ r => $SVN->get_latest_revnum,
835-
ra => $SVN, c => $tb,
835+
ra => $SVN_LOG, c => $tb,
836836
svn_path => $SVN_PATH
837837
},
838838
$SVN->get_commit_editor($_message,

0 commit comments

Comments
 (0)