[PATCH] git-svn: fix commits over svn+ssh://

[PATCH] git-svn: fix commits over svn+ssh://

[Eric Wong]

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>
---
 git-svn.perl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index a128d90..0f968c8 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -536,7 +536,7 @@ sub commit_lib {
 			$SVN = libsvn_connect($repo);
 			my $ed = SVN::Git::Editor->new(
 					{	r => $r_last,
-						ra => $SVN,
+						ra => $SVN_LOG,
 						c => $c,
 						svn_path => $SVN_PATH
 					},
@@ -832,7 +832,7 @@ sub commit_diff {
 	$SVN ||= libsvn_connect($repo);
 	my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
 	my $ed = SVN::Git::Editor->new({	r => $SVN->get_latest_revnum,
-						ra => $SVN, c => $tb,
+						ra => $SVN_LOG, c => $tb,
 						svn_path => $SVN_PATH
 					},
 				$SVN->get_commit_editor($_message,
-- 
1.4.3.rc2.g1cbb0

[PATCH] Re: git-svn: fix commits over svn+ssh://

[Pierre HABOUZIT]

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

  I confirm that fixes it indeed.

On Sat, Oct 14, 2006 at 02:02:37AM -0700, Eric Wong wrote:
> 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>
> ---
>  git-svn.perl |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index a128d90..0f968c8 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -536,7 +536,7 @@ sub commit_lib {
>  			$SVN = libsvn_connect($repo);
>  			my $ed = SVN::Git::Editor->new(
>  					{	r => $r_last,
> -						ra => $SVN,
> +						ra => $SVN_LOG,
>  						c => $c,
>  						svn_path => $SVN_PATH
>  					},
> @@ -832,7 +832,7 @@ sub commit_diff {
>  	$SVN ||= libsvn_connect($repo);
>  	my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
>  	my $ed = SVN::Git::Editor->new({	r => $SVN->get_latest_revnum,
> -						ra => $SVN, c => $tb,
> +						ra => $SVN_LOG, c => $tb,
>  						svn_path => $SVN_PATH
>  					},
>  				$SVN->get_commit_editor($_message,
-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]