git-svn: don't blindly append '*' to branch/tags config

Previously, git-svn would blindly append '*' even if it was specified by the user during initialization (for certain SVN setups, it is necessary). Now, the following command will work correctly: git svn init -T trunk/docutils \ -t 'tags/*/docutils' \ -b 'branches/*/docutils' \ svn://svn.berlios.de/docutils Thanks to martin f krafft for the bug report: > My git-svn target configuration is > > [svn-remote "svn"] > url = svn://svn.berlios.de/docutils > fetch = trunk/docutils:refs/remotes/trunk > branches = branches/*/docutils:refs/remotes/* > tags = tags/*/docutils:refs/remotes/tags/* > > Unfortunately, when I run > > git-svn init -T trunk/docutils -t 'tags/*/docutils' > -b 'branches/*/docutils' > > then I get (note the two asterisks on the left hand side): > > branches = branches/*/docutils/*:refs/remotes/* > tags = tags/*/docutils/*:refs/remotes/tags/* > > I took a brief stab at the code but I can't even figure out where > the /* is appended, so I defer to you. > > It should be trivial to keep git-svn from appending /* if the left > side already contains an asterisk. Signed-off-by: Eric Wong <normalperson@yhbt.net> Tested-by: martin f krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Wong committed Mar 14, 2008 at 11:01 UTC ed0b9d43097349f4d730472673c07f427480e14a

1 file changed +2 -1

git-svn.perl

+2 -1

@@ -955,9 +955,10 @@ sub complete_url_ls_init {

955 "wanted to set to: $gs->{url}\n";

956 }

957 command_oneline('config', $k, $gs->{url}) unless $orig_url;

958 - my $remote_path = "$ra->{svn_path}/$repo_path/*";

958 + my $remote_path = "$ra->{svn_path}/$repo_path";

959 $remote_path =~ s#/+#/#g;

960 $remote_path =~ s#^/##g;

961 + $remote_path .= "/*" if $remote_path !~ /\*/;

962 my ($n) = ($switch =~ /^--(\w+)/);

963 if (length $pfx && $pfx !~ m#/$#) {

964 die "--prefix='$pfx' must have a trailing slash '/'\n";