From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 25 Jun 2009 09:28:15 +0000 (-0700)
Subject: git-svn: convert globs to regexps for branch destinations
X-Git-Tag: v1.6.4-rc0~36^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f7050599310c18bd67b35b8d59486116b30ff1f6;p=git.git

git-svn: convert globs to regexps for branch destinations

Marc Branchaud wrote:
> I'm fairly happy with this, except for the way the branch
> subcommand matches refspecs.  The patch does a simple string
> comparison, but it'd be better to do an actual glob.  I just
> couldn't track down the right function for that, so I left it as
> a strcmp and hope that a gitizen can tell me how to glob here.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 48e8aad00..6c42e2afc 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -646,7 +646,9 @@ sub cmd_branch {
 		            " with the --destination argument.\n";
 		}
 		foreach my $g (@{$allglobs}) {
-			if ($_branch_dest eq $g->{path}->{left}) {
+			# SVN::Git::Editor could probably be moved to Git.pm..
+			my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
+			if ($_branch_dest =~ /$re/) {
 				$glob = $g;
 				last;
 			}