From: Russ Cox <rsc@golang.org>
Date: Mon, 2 Mar 2015 18:49:57 +0000 (-0500)
Subject: cmd/go: avoid creating new empty environment variables
X-Git-Tag: go1.5beta1~1771
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8012a2e9c96c6c14607388f85079400d2d419c0b;p=gostls13.git

cmd/go: avoid creating new empty environment variables

Broke some tests that assume $GORACE is unset (because it never is).
Those tests are arguably wrong, but this is more robust.

Change-Id: Id56daa160c9e7e01f301c1386791e410bbd5deef
Reviewed-on: https://go-review.googlesource.com/6480
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index a13d990cfc..5e0ab79df3 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -158,7 +158,9 @@ func main() {
 	// but in practice there might be skew
 	// This makes sure we all agree.
 	for _, env := range mkEnv() {
-		os.Setenv(env.name, env.value)
+		if os.Getenv(env.name) != env.value {
+			os.Setenv(env.name, env.value)
+		}
 	}
 
 	for _, cmd := range commands {