[PATCH] git-svn: Ignore usernames in URLs in find_by_url

[PATCH] git-svn: Ignore usernames in URLs in find_by_url

[Adam Roben]

Usernames don't matter for the purposes of find_by_url, so always remove them
before doing any comparisons.

Signed-off-by: Adam Roben <aroben@apple.com>
---
 git-svn.perl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 90f3bc1..59008cc 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1064,6 +1064,8 @@ sub init_remote_config {
 
 sub find_by_url { # repos_root and, path are optional
 	my ($class, $full_url, $repos_root, $path) = @_;
+	remove_username($full_url);
+	remove_username($repos_root) if defined $repos_root;
 	return undef unless defined $full_url;
 	my $remotes = read_all_remotes();
 	if (defined $full_url && defined $repos_root && !defined $path) {
@@ -1072,6 +1074,7 @@ sub find_by_url { # repos_root and, path are optional
 	}
 	foreach my $repo_id (keys %$remotes) {
 		my $u = $remotes->{$repo_id}->{url} or next;
+		remove_username($u);
 		next if defined $repos_root && $repos_root ne $u;
 
 		my $fetch = $remotes->{$repo_id}->{fetch} || {};
-- 
1.5.2.rc0.16.ge10ca-dirty

Re: [PATCH] git-svn: Ignore usernames in URLs in find_by_url

[Eric Wong]

Adam Roben <aroben@apple.com> wrote:
> Usernames don't matter for the purposes of find_by_url, so always remove them
> before doing any comparisons.
 
> Signed-off-by: Adam Roben <aroben@apple.com>
> ---
>  git-svn.perl |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 90f3bc1..59008cc 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -1064,6 +1064,8 @@ sub init_remote_config {
>  
>  sub find_by_url { # repos_root and, path are optional
>  	my ($class, $full_url, $repos_root, $path) = @_;
> +	remove_username($full_url);
> +	remove_username($repos_root) if defined $repos_root;
>  	return undef unless defined $full_url;
	^-- this line should probably be moved up

Otherwise,
Acked-by: Eric Wong <normalperson@yhbt.net>

>  	my $remotes = read_all_remotes();
>  	if (defined $full_url && defined $repos_root && !defined $path) {
> @@ -1072,6 +1074,7 @@ sub find_by_url { # repos_root and, path are optional
>  	}
>  	foreach my $repo_id (keys %$remotes) {
>  		my $u = $remotes->{$repo_id}->{url} or next;
> +		remove_username($u);
>  		next if defined $repos_root && $repos_root ne $u;
>  
>  		my $fetch = $remotes->{$repo_id}->{fetch} || {};
> -- 
> 1.5.2.rc0.16.ge10ca-dirty
-- 
Eric Wong