From 9e31b1775aaab995986c9d986704e5ba4eddbe47 Mon Sep 17 00:00:00 2001 From: LE Manh Cuong Date: Wed, 22 May 2019 17:52:24 +0700 Subject: [PATCH] cmd/go: use the rev to resolve tags for pseudo-versions in mod init Fixes #32161 Updates #31251 Change-Id: I22760836b48cd734b90bc43aacb23e23e38c0f4e Reviewed-on: https://go-review.googlesource.com/c/go/+/178497 Reviewed-by: Bryan C. Mills --- src/cmd/go/internal/modfetch/repo.go | 2 +- src/cmd/go/testdata/script/mod_init_glide.txt | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/cmd/go/testdata/script/mod_init_glide.txt diff --git a/src/cmd/go/internal/modfetch/repo.go b/src/cmd/go/internal/modfetch/repo.go index d197c00fe4..92e977646f 100644 --- a/src/cmd/go/internal/modfetch/repo.go +++ b/src/cmd/go/internal/modfetch/repo.go @@ -319,7 +319,7 @@ func ImportRepoRev(path, rev string) (Repo, *RevInfo, error) { return nil, nil, err } - info, err := repo.(*codeRepo).convert(revInfo, "") + info, err := repo.(*codeRepo).convert(revInfo, rev) if err != nil { return nil, nil, err } diff --git a/src/cmd/go/testdata/script/mod_init_glide.txt b/src/cmd/go/testdata/script/mod_init_glide.txt new file mode 100644 index 0000000000..cd80d77b26 --- /dev/null +++ b/src/cmd/go/testdata/script/mod_init_glide.txt @@ -0,0 +1,32 @@ +env GO111MODULE=on + +[!net] skip +[!exec:git] skip + +# test glide replacement +go mod init x +cmpenv go.mod go.mod.out + +-- main.go -- +package main + +import ( + _ "github.com/rsc/legacytest" +) + +func main() {} + +-- glide.lock -- +imports: +- name: github.com/rsc/legacytest + version: fb3c628075e32f7f3c248a3abbdafd69ad6e21e1 + +-- glide.yaml -- +package: x + +-- go.mod.out -- +module x + +go $goversion + +require github.com/rsc/legacytest v1.1.0-pre.0.20180717164849-fb3c628075e3 -- 2.50.0