From 71984fd6abdcb93cf4ea1bc31cafc102a7c90549 Mon Sep 17 00:00:00 2001 From: Piyush Mishra Date: Fri, 9 Feb 2018 03:32:17 +0000 Subject: [PATCH] cmd/go/internal/get: fix regexes for "any" character matching Minor bug: `hubajazz.net` and `gitbapache.org` would match, probably shouldn't GitHub-Last-Rev: 75bd338569ca41f83b9c36fe3d5ae3b4db0a26cc GitHub-Pull-Request: golang/go#23755 Change-Id: Ie9c9ab1c15364eccdab8cf3b106b9c370e7f532f Reviewed-on: https://go-review.googlesource.com/92997 Run-TryBot: Andrew Bonventre TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/cmd/go/internal/get/vcs.go | 4 ++-- src/cmd/go/internal/get/vcs_test.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/get/vcs.go b/src/cmd/go/internal/get/vcs.go index 26693b13a9..ee6b16a136 100644 --- a/src/cmd/go/internal/get/vcs.go +++ b/src/cmd/go/internal/get/vcs.go @@ -971,7 +971,7 @@ var vcsPaths = []*vcsPath{ // IBM DevOps Services (JazzHub) { prefix: "hub.jazz.net/git/", - re: `^(?Phub.jazz.net/git/[a-z0-9]+/[A-Za-z0-9_.\-]+)(/[A-Za-z0-9_.\-]+)*$`, + re: `^(?Phub\.jazz\.net/git/[a-z0-9]+/[A-Za-z0-9_.\-]+)(/[A-Za-z0-9_.\-]+)*$`, vcs: "git", repo: "https://{root}", check: noVCSSuffix, @@ -980,7 +980,7 @@ var vcsPaths = []*vcsPath{ // Git at Apache { prefix: "git.apache.org/", - re: `^(?Pgit.apache.org/[a-z0-9_.\-]+\.git)(/[A-Za-z0-9_.\-]+)*$`, + re: `^(?Pgit\.apache\.org/[a-z0-9_.\-]+\.git)(/[A-Za-z0-9_.\-]+)*$`, vcs: "git", repo: "https://{root}", }, diff --git a/src/cmd/go/internal/get/vcs_test.go b/src/cmd/go/internal/get/vcs_test.go index e29338aec1..2cb611fabd 100644 --- a/src/cmd/go/internal/get/vcs_test.go +++ b/src/cmd/go/internal/get/vcs_test.go @@ -59,6 +59,10 @@ func TestRepoRootForImportPath(t *testing.T) { "hub.jazz.net", nil, }, + { + "hubajazz.net", + nil, + }, { "hub2.jazz.net", nil, @@ -140,6 +144,10 @@ func TestRepoRootForImportPath(t *testing.T) { "git.apache.org/package-name/path/to/lib", nil, }, + { + "gitbapache.org", + nil, + }, { "git.apache.org/package-name.git", &repoRoot{ -- 2.48.1