From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Wong Subject: Re: [PATCH] git-svn: Abort with an error if 'fetch' parameter is invalid. Date: Sun, 3 Aug 2008 17:01:40 -0700 Message-ID: <20080804000140.GA13019@untitled> References: <1217451235-9609-1-git-send-email-apenwarr@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Avery Pennarun To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Aug 04 02:02:45 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KPnX9-0006jl-F5 for gcvg-git-2@gmane.org; Mon, 04 Aug 2008 02:02:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753095AbYHDABl (ORCPT ); Sun, 3 Aug 2008 20:01:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752950AbYHDABl (ORCPT ); Sun, 3 Aug 2008 20:01:41 -0400 Received: from hand.yhbt.net ([66.150.188.102]:50113 "EHLO hand.yhbt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752906AbYHDABl (ORCPT ); Sun, 3 Aug 2008 20:01:41 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by hand.yhbt.net (Postfix) with ESMTP id AC4322DC01B; Sun, 3 Aug 2008 17:01:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1217451235-9609-1-git-send-email-apenwarr@gmail.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 > >