From: Bryan C. Mills <bcmills@google.com>
Date: Fri, 12 Mar 2021 16:26:51 +0000 (-0500)
Subject: cmd/go/internal/modcmd: in 'go mod tidy', suspend go.mod writes until tidy
X-Git-Tag: go1.17beta1~1107
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=26c32de7c9;p=gostls13.git

cmd/go/internal/modcmd: in 'go mod tidy', suspend go.mod writes until tidy

For #36460

Change-Id: Ia8633f37aec8c7ed532bf7278867251e5e2a4285
Reviewed-on: https://go-review.googlesource.com/c/go/+/301370
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
---

diff --git a/src/cmd/go/internal/modcmd/tidy.go b/src/cmd/go/internal/modcmd/tidy.go
index 34ff86ff18..33ecd80bcb 100644
--- a/src/cmd/go/internal/modcmd/tidy.go
+++ b/src/cmd/go/internal/modcmd/tidy.go
@@ -60,6 +60,7 @@ func runTidy(ctx context.Context, cmd *base.Command, args []string) {
 	// request that their test dependencies be included.
 	modload.ForceUseModules = true
 	modload.RootMode = modload.NeedRoot
+	modload.DisallowWriteGoMod() // Suppress writing until we've tidied the file.
 
 	modload.LoadPackages(ctx, modload.PackageOpts{
 		Tags:                     imports.AnyTags(),
@@ -72,5 +73,7 @@ func runTidy(ctx context.Context, cmd *base.Command, args []string) {
 
 	modload.TidyBuildList()
 	modload.TrimGoSum()
+
+	modload.AllowWriteGoMod()
 	modload.WriteGoMod()
 }