[commit: ghc] master: Fix branch name check regex in sync-all (9c2dade)

git at git.haskell.org git at git.haskell.org
Thu Nov 21 13:15:52 UTC 2013


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9c2dade94fae5f4fe19cd972ca1f1049c633e4ed/ghc

>---------------------------------------------------------------

commit 9c2dade94fae5f4fe19cd972ca1f1049c633e4ed
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Nov 21 13:14:56 2013 +0000

    Fix branch name check regex in sync-all


>---------------------------------------------------------------

9c2dade94fae5f4fe19cd972ca1f1049c633e4ed
 sync-all |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sync-all b/sync-all
index c316e64..38a840d 100755
--- a/sync-all
+++ b/sync-all
@@ -163,14 +163,14 @@ sub getrepo {
         my $git_dir = $bare_flag ? "ghc.git" : ".";
         my $branch = &readgit($git_dir, "rev-parse", "--abbrev-ref", "HEAD");
         die "Bad branch: $branch"
-            unless $branch =~ m!^[a-zA-Z][a-zA-Z0-9.-/]*$!;
+            unless $branch =~ m!^[a-zA-Z][a-zA-Z0-9./-]*$!;
         my $remote = &readgit($git_dir, "config", "branch.$branch.remote");
         if ($remote eq "") {
             # remotes are not mandatory for branches (e.g. not recorded by default for bare repos)
             $remote = "origin";
         }
         die "Bad remote: $remote"
-            unless $remote =~ m!^[a-zA-Z][a-zA-Z0-9.-/]*$!;
+            unless $remote =~ m!^[a-zA-Z][a-zA-Z0-9./-]*$!;
         $repo = &readgit($git_dir, "config", "remote.$remote.url");
     }
 
@@ -541,7 +541,7 @@ sub gitall {
             print (' ' x (40 - length($localpath)));
             my $branch = &readgit($localpath, "rev-parse", "--abbrev-ref", "HEAD");
             die "Bad branch: $branch"
-                unless $branch =~ m!^[a-zA-Z][a-zA-Z0-9.-/]*$!;
+                unless $branch =~ m!^[a-zA-Z][a-zA-Z0-9./-]*$!;
             my $us   = &readgit(".", "ls-remote", $localpath, "refs/heads/$branch");
             my $them = &readgit(".", "ls-remote", $compareto, "refs/heads/$branch");
             $us   =~ s/[[:space:]].*//;



More information about the ghc-commits mailing list