diff options
| author | Piyush Mishra <piyush@codeitout.com> | 2018-02-09 03:32:17 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-02-13 19:47:48 +0000 |
| commit | 71984fd6abdcb93cf4ea1bc31cafc102a7c90549 (patch) | |
| tree | 9d29b554a2cac81ae22888302c977f6beb9192ac /src | |
| parent | 25d22d9abae4345c24cd2ae7f26de1846888faa4 (diff) | |
| download | go-71984fd6abdcb93cf4ea1bc31cafc102a7c90549.tar.xz | |
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 <andybons@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go/internal/get/vcs.go | 4 | ||||
| -rw-r--r-- | 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: `^(?P<root>hub.jazz.net/git/[a-z0-9]+/[A-Za-z0-9_.\-]+)(/[A-Za-z0-9_.\-]+)*$`, + re: `^(?P<root>hub\.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: `^(?P<root>git.apache.org/[a-z0-9_.\-]+\.git)(/[A-Za-z0-9_.\-]+)*$`, + re: `^(?P<root>git\.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 @@ -60,6 +60,10 @@ func TestRepoRootForImportPath(t *testing.T) { nil, }, { + "hubajazz.net", + nil, + }, + { "hub2.jazz.net", nil, }, @@ -141,6 +145,10 @@ func TestRepoRootForImportPath(t *testing.T) { nil, }, { + "gitbapache.org", + nil, + }, + { "git.apache.org/package-name.git", &repoRoot{ vcs: vcsGit, |