aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modfetch/fetch.go
diff options
context:
space:
mode:
authorDmitri Shuralyov <dmitshur@golang.org>2020-11-05 10:08:11 -0500
committerDmitri Shuralyov <dmitshur@golang.org>2020-11-05 15:16:57 +0000
commit34c09695db93218217703362135c6fede35535e0 (patch)
treefc99ed91418b287a72751dd121f828c917d49bc6 /src/cmd/go/internal/modfetch/fetch.go
parent74ec40fc8acffb81f17ccbaa498b15f694c25e4d (diff)
downloadgo-34c09695db93218217703362135c6fede35535e0.tar.gz
go-34c09695db93218217703362135c6fede35535e0.zip
cmd/go: revert "add GOVCS setting to control version control usage"
This reverts CL 266420. Reason for revert: tests aren't passing on linux-{386,amd64}-longtest. Change-Id: Icec47cded795a51ef7569dfb2d93d9211b4fb578 Reviewed-on: https://go-review.googlesource.com/c/go/+/267799 Trust: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modfetch/fetch.go')
-rw-r--r--src/cmd/go/internal/modfetch/fetch.go13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index a3e2cd1f9d..25e9fb62c1 100644
--- a/src/cmd/go/internal/modfetch/fetch.go
+++ b/src/cmd/go/internal/modfetch/fetch.go
@@ -848,16 +848,16 @@ the checksum database is not consulted, and all unrecognized modules are
accepted, at the cost of giving up the security guarantee of verified repeatable
downloads for all modules. A better way to bypass the checksum database
for specific modules is to use the GOPRIVATE or GONOSUMDB environment
-variables. See 'go help private' for details.
+variables. See 'go help module-private' for details.
The 'go env -w' command (see 'go help env') can be used to set these variables
for future go command invocations.
`,
}
-var HelpPrivate = &base.Command{
- UsageLine: "private",
- Short: "configuration for downloading non-public code",
+var HelpModulePrivate = &base.Command{
+ UsageLine: "module-private",
+ Short: "module configuration for non-public modules",
Long: `
The go command defaults to downloading modules from the public Go module
mirror at proxy.golang.org. It also defaults to validating downloaded modules,
@@ -898,11 +898,6 @@ be used for downloading both public and private modules, because
GONOPROXY has been set to a pattern that won't match any modules,
overriding GOPRIVATE.
-The GOPRIVATE variable is also used to define the "public" and "private"
-patterns for the GOVCS variable; see 'go help vcs'. For that usage,
-GOPRIVATE applies even in GOPATH mode. In that case, it matches import paths
-instead of module paths.
-
The 'go env -w' command (see 'go help env') can be used to set these variables
for future go command invocations.
`,