diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-10-14 02:02:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-14 11:48:33 -0700 |
| commit | ce91fc6eb9c4aefc73f845fc7104f332b2b308d2 (patch) | |
| tree | 4741f3715f32149b16c06dfaa50fb73de757b553 /git-svn.perl | |
| parent | 4035b46e12ee6e5c9339e263cd16c2e2422b8928 (diff) | |
| download | git-ce91fc6eb9c4aefc73f845fc7104f332b2b308d2.tar.gz git-ce91fc6eb9c4aefc73f845fc7104f332b2b308d2.tar.xz | |
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>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index a128d90fc..0f968c8ce 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, |