From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 17 Jan 2009 10:54:27 GMT
Subject: Re: [PATCH] git svn clone -s was not prefixing 'branches/'
Message-ID: <20090117105427.GA15801@dcvr.yhbt.net>
In-Reply-To: <1232050647-2870-1-git-send-email-snowblink@gmail.com>

Jonathan Lim <snowblink@gmail.com> wrote:
> All branches in the subversion repository would appear at the same
> level as trunk.  The should now appear with a 'branches/' prefix.
> 
> Signed-off-by: Jonathan Lim <snowblink@gmail.com>

This is too ugly for the common existing cases.  For the rare case where
this could lead to a namespace conflict[1], it's possible to work around
it by editing .git/config.

I would accept a --tags-prefix= and --branches-prefix= patch to make
this possible w/o having to edit .git/config, but I don't want the
default prefixes changed.

Thanks,

[1] - "/branches/trunk" vs "/trunk", which I've yet to see evidence of...

> ---
>  git-svn.perl |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index ad01e18..17d65cb 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -789,7 +789,7 @@ sub cmd_multi_init {
>  	}
>  	return unless defined $_branches || defined $_tags;
>  	my $ra = $url ? Git::SVN::Ra->new($url) : undef;
> -	complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
> +	complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix . 'branches/');
>  	complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
>  }