Code

git-svn: convert globs to regexps for branch destinations
authorEric Wong <normalperson@yhbt.net>
Thu, 25 Jun 2009 09:28:15 +0000 (02:28 -0700)
committerEric Wong <normalperson@yhbt.net>
Thu, 25 Jun 2009 09:28:25 +0000 (02:28 -0700)
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>
git-svn.perl

index 48e8aad0001508b25f503e900c0bb06d441d2af5..6c42e2afca8f0fdc699fe36b866050f20e8a7f1a 100755 (executable)
@@ -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;
                        }