[commit: ghc] master: sync-all: Allow - in submodule URLs (c7dacdb)

[git at git.haskell.org]

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

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

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

commit c7dacdb83494737d9a23f9ceb682d34fdd84d631
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jun 25 10:52:36 2014 -0700

    sync-all: Allow - in submodule URLs


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

c7dacdb83494737d9a23f9ceb682d34fdd84d631
 sync-all | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sync-all b/sync-all
index ffc150e..7012647 100755
--- a/sync-all
+++ b/sync-all
@@ -588,14 +588,14 @@ sub gitInitSubmodules {
 
     my $submodulespaths = &readgit(".", "config", "--get-regexp", "^submodule[.].*[.]url");
     # if we came from github, change the urls appropriately
-    while ($submodulespaths =~ m!^(submodule.(?:libraries|utils)/[a-zA-Z0-9]+.url) ($GITHUB)/ghc/packages/([a-zA-Z0-9]+).git$!gm) {
+    while ($submodulespaths =~ m!^(submodule.(?:libraries|utils)/[a-zA-Z0-9-]+.url) ($GITHUB)/ghc/packages/([a-zA-Z0-9-]+).git$!gm) {
         &git(".", "config", $1, "$2/ghc/packages-$3");
     }
 
     # if we came from a local repository, grab our submodules from their
     # checkouts over there, if they exist.
     if ($repo_local) {
-        while ($submodulespaths =~ m!^(submodule.((?:libraries|utils)/[a-zA-Z0-9]+).url) .*$!gm) {
+        while ($submodulespaths =~ m!^(submodule.((?:libraries|utils)/[a-zA-Z0-9-]+).url) .*$!gm) {
             if (-e "$repo_base/$2/.git") {
                 &git(".", "config", $1, "$repo_base/$2");
             }