summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-12-23 06:40:18 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-12-23 19:58:05 (GMT)
commit150d38c4f3733b38c2c212469afa162a55e0e99d (patch)
tree010d784cdf08c9d3b35cb8e62e66f842b35ea4c3 /git-svn.perl
parent129a5a6deacfe6ffb32291fcd96e0d1567f780b2 (diff)
downloadgit-150d38c4f3733b38c2c212469afa162a55e0e99d.zip
git-150d38c4f3733b38c2c212469afa162a55e0e99d.tar.gz
git-150d38c4f3733b38c2c212469afa162a55e0e99d.tar.bz2
git svn: branch/tag commands detect username in URLs
svn+ssh:// repositories often have userinfo embedded in the URL which were stripped out of the "git-svn-id:" trailers. Since the SVN::Client::copy function takes userinfo into account when matching URLs for SVN repositories, we need to retrieve the full URL with embedded userinfo in it to avoid mismatched URLs. Tested-by: Florian Köberle <florian@fkoeberle.de> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index dba0d12..650c9e5 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -663,7 +663,8 @@ sub cmd_branch {
}
$head ||= 'HEAD';
- my ($src, $rev, undef, $gs) = working_head_info($head);
+ my (undef, $rev, undef, $gs) = working_head_info($head);
+ my $src = $gs->full_url;
my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };