threads / discuss / 12667

git-svn -t/-b should respect existing *

Subject: git-svn -t/-b should respect existing *

## tl;dr

3 messages between Mar 13, 2008 and Mar 14, 2008.

replies: 2people: 2as markdown or json

martin f krafft· Mar 13, 2008, 11:27 UTC · lore
Hi folks,
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.

Thanks,
-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
"auch der mutigste von uns hat nur selten den mut zu dem,
 was er eigentlich weiß."
                                                 - friedrich nietzsche
 
spamtraps: madduck.bogus@madduck.net
Eric Wong· Mar 14, 2008, 18:01 UTC · re: martin f krafft · lore

[PATCH] 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:
Show 23 quoted lines
> 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>
---
 git-svn.perl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index d8b38c9..bba22c1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -958,9 +958,10 @@ sub complete_url_ls_init {
 		    "wanted to set to: $gs->{url}\n";
 	}
 	command_oneline('config', $k, $gs->{url}) unless $orig_url;
-	my $remote_path = "$ra->{svn_path}/$repo_path/*";
+	my $remote_path = "$ra->{svn_path}/$repo_path";
 	$remote_path =~ s#/+#/#g;
 	$remote_path =~ s#^/##g;
+	$remote_path .= "/*" if $remote_path !~ /\*/;
 	my ($n) = ($switch =~ /^--(\w+)/);
 	if (length $pfx && $pfx !~ m#/$#) {
 		die "--prefix='$pfx' must have a trailing slash '/'\n";

-- 
Eric Wong
martin f krafft· Mar 14, 2008, 19:39 UTC · re: Eric Wong · lore

Re: [PATCH] git-svn: don't blindly append '*' to branch/tags config

also sprach Eric Wong <normalperson@yhbt.net> [2008.03.14.1901 +0100]:
Show 10 quoted lines
> 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
I can confirm this. Thanks, Eric for the blazing turnaround time.
-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
"the surest way to corrupt a youth is to instruct him to hold in
 higher esteem those who think alike than those who think
 differently."
                                              -- friedrich nietzsche
 
spamtraps: madduck.bogus@madduck.net

← back to recent threads