# Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. 4 messages from 2008-07-30 to 2008-08-04. Participants: Avery Pennarun, Eric Wong, Junio C Hamano. Thread: https://gitlist.dev/t/14767 ## Avery Pennarun, 2008-07-30 20:56 Subject: Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Message-ID: <32541b130807301356n68bf1a2an9443f1fc48f0e22c@mail.gmail.com> URL: https://gitlist.dev/e/32541b130807301356n68bf1a2an9443f1fc48f0e22c%40mail.gmail.com In-Reply-To: <1217451235-9609-1-git-send-email-apenwarr@gmail.com> ``` On 7/30/08, Avery Pennarun wrote: > ... Please excuse the broken From: line on the above patch. The @gmail.com address is correct. Avery ``` ## Eric Wong, 2008-08-04 00:01 Subject: Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Message-ID: <20080804000140.GA13019@untitled> URL: https://gitlist.dev/e/20080804000140.GA13019%40untitled In-Reply-To: <1217451235-9609-1-git-send-email-apenwarr@gmail.com> ``` Avery Pennarun wrote: > Previously, if a config entry looked like this: > > svn-remote.svn.fetch=:refs/heads/whatever > > git-svn would silently do nothing if you asked it to "git svn fetch", and > give a strange error if asked to "git svn dcommit". What it really wants is > a line that looks like this: > > svn-remote.svn.fetch=:refs/remotes/whatever > > So we should simply abort if we get the wrong thing. > > On the other hand, there's actually no good reason for git-svn to enforce > using the refs/remotes namespace, but the code seems to have hardcoded this > in several places and I'm not brave enough to try to fix it all right now. Fully agreed (as I've stated in the past, too). I just haven't had time to fix it. > Signed-off-by: Avery Pennarun Thanks Avery, Acked-by: Eric Wong > --- > > I just spent altogether too much time tracking down this problem when > migrating my git-svn settings from one repo to another. > > git-svn.perl | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/git-svn.perl b/git-svn.perl > index cf6dbbc..cc35f50 100755 > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -1420,8 +1420,12 @@ sub read_all_remotes { > svn.useSvmProps/) }; > $use_svm_props = $use_svm_props eq 'true' if $use_svm_props; > foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) { > - if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) { > - my ($remote, $local_ref, $remote_ref) = ($1, $2, $3); > + if (m!^(.+)\.fetch=\s*(.*)\s*:\s*(.+)\s*$!) { > + my ($remote, $local_ref, $_remote_ref) = ($1, $2, $3); > + die("svn-remote.$remote: remote ref '$_remote_ref' " > + . "must start with 'refs/remotes/'\n") > + unless $_remote_ref =~ m{^refs/remotes/(.+)}; > + my $remote_ref = $1; > $local_ref =~ s{^/}{}; > $r->{$remote}->{fetch}->{$local_ref} = $remote_ref; > $r->{$remote}->{svm} = {} if $use_svm_props; > -- > 1.6.0.rc0.42.g186458.dirty > > ``` ## Junio C Hamano, 2008-08-04 00:21 Subject: Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Message-ID: <7viquh7hpq.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7viquh7hpq.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20080804000140.GA13019@untitled> ``` Eric Wong writes: >> Signed-off-by: Avery Pennarun > > Thanks Avery, > Acked-by: Eric Wong I do not seem to find the original message in mbox nor list archive, by the way... ``` ## Eric Wong, 2008-08-04 00:46 Subject: Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Message-ID: <20080804004618.GA3182@untitled> URL: https://gitlist.dev/e/20080804004618.GA3182%40untitled In-Reply-To: <7viquh7hpq.fsf@gitster.siamese.dyndns.org> ``` Junio C Hamano wrote: > Eric Wong writes: > > >> Signed-off-by: Avery Pennarun > > > > Thanks Avery, > > Acked-by: Eric Wong > > I do not seem to find the original message in mbox nor list archive, by > the way... Could've been Avery's original From: line not being spam filter friendly. Here you go (with From: line fixed) >From 574c237f4561cf0293e7f44ab604bb701d1931f3 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Wed, 30 Jul 2008 16:53:55 -0400 Subject: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Previously, if a config entry looked like this: svn-remote.svn.fetch=:refs/heads/whatever git-svn would silently do nothing if you asked it to "git svn fetch", and give a strange error if asked to "git svn dcommit". What it really wants is a line that looks like this: svn-remote.svn.fetch=:refs/remotes/whatever So we should simply abort if we get the wrong thing. On the other hand, there's actually no good reason for git-svn to enforce using the refs/remotes namespace, but the code seems to have hardcoded this in several places and I'm not brave enough to try to fix it all right now. Signed-off-by: Avery Pennarun --- git-svn.perl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 0a346f8..1c39f45 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1423,8 +1423,12 @@ sub read_all_remotes { svn.useSvmProps/) }; $use_svm_props = $use_svm_props eq 'true' if $use_svm_props; foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) { - if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) { - my ($remote, $local_ref, $remote_ref) = ($1, $2, $3); + if (m!^(.+)\.fetch=\s*(.*)\s*:\s*(.+)\s*$!) { + my ($remote, $local_ref, $_remote_ref) = ($1, $2, $3); + die("svn-remote.$remote: remote ref '$_remote_ref' " + . "must start with 'refs/remotes/'\n") + unless $_remote_ref =~ m{^refs/remotes/(.+)}; + my $remote_ref = $1; $local_ref =~ s{^/}{}; $r->{$remote}->{fetch}->{$local_ref} = $remote_ref; $r->{$remote}->{svm} = {} if $use_svm_props; -- Eric Wong ```