[commit: ghc] master: Allow branches with / in them (e.g. wip/) in ./sync-all (4e2f6c2)
git at git.haskell.org
git at git.haskell.org
Tue Sep 17 15:46:07 CEST 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/4e2f6c27c89852756a39ab1190560f0311576b3f/ghc
>---------------------------------------------------------------
commit 4e2f6c27c89852756a39ab1190560f0311576b3f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Sep 17 15:45:48 2013 +0200
Allow branches with / in them (e.g. wip/) in ./sync-all
>---------------------------------------------------------------
4e2f6c27c89852756a39ab1190560f0311576b3f
sync-all | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sync-all b/sync-all
index f37c379..55b737c 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 =~ /^[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 =~ /^[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");
}
@@ -539,7 +539,7 @@ sub gitall {
print (' ' x (40 - length($localpath)));
my $branch = &readgit($localpath, "rev-parse", "--abbrev-ref", "HEAD");
die "Bad branch: $branch"
- unless $branch =~ /^[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