From a685a8d11484b87f61f9317fd92151b7cc46d124 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 1 Aug 2018 13:22:02 -0400 Subject: [PATCH] cmd/go: make 'go get @none' idempotent Before this change, 'go get @none' for a module not in the build list would add the module to go.mod (with the explicit version string "none"). Subsequent go commands would fail with 'invalid module version "none"'. Change-Id: Iebcaeab89eb19959f0a9aeda836f179962953313 Reviewed-on: https://go-review.googlesource.com/127215 Reviewed-by: Russ Cox --- src/cmd/go/internal/modget/get.go | 6 ++++-- src/cmd/go/testdata/script/mod_get_none.txt | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/cmd/go/testdata/script/mod_get_none.txt diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go index e8b08573d7..cf0c1acbca 100644 --- a/src/cmd/go/internal/modget/get.go +++ b/src/cmd/go/internal/modget/get.go @@ -374,7 +374,7 @@ func runGet(cmd *base.Command, args []string) { // Now we know the specific version of each path@vers. // The final build list will be the union of three build lists: // 1. the original build list - // 2. the modules named on the command line + // 2. the modules named on the command line (other than @none) // 3. the upgraded requirements of those modules (if upgrading) // Start building those lists. // This loop collects (2). @@ -395,7 +395,9 @@ func runGet(cmd *base.Command, args []string) { continue // already added } byPath[t.m.Path] = t - named = append(named, t.m) + if t.m.Version != "none" { + named = append(named, t.m) + } } base.ExitIfErrors() diff --git a/src/cmd/go/testdata/script/mod_get_none.txt b/src/cmd/go/testdata/script/mod_get_none.txt new file mode 100644 index 0000000000..5aec209f59 --- /dev/null +++ b/src/cmd/go/testdata/script/mod_get_none.txt @@ -0,0 +1,12 @@ +env GO111MODULE=on + +go mod init example.com/foo + +# 'go get bar@none' should be a no-op if module bar is not active. +go get example.com/bar@none +go list -m all +! stdout example.com/bar + +go get example.com/bar@none +go list -m all +! stdout example.com/bar