git svn: branch/tag commands detect username in URLs

Eric Wong · Eric Wong · commit 150d38c4f373 · 2009-12-23T11:58:05.000-08:00
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 &lt;florian@fkoeberle.de&gt;
Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git 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' };

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,8 @@ sub cmd_branch {`
`663`	`663`	`}`
`664`	`664`	`$head \|\|= 'HEAD';`
`665`	`665`
`666`		`- my ($src, $rev, undef, $gs) = working_head_info($head);`
	`666`	`+ my (undef, $rev, undef, $gs) = working_head_info($head);`
	`667`	`+ my $src = $gs->full_url;`
`667`	`668`
`668`	`669`	`my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};`
`669`	`670`	`my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };`