Merge pull request #1205 from luhring/git-side-effect

fix(git): test flaking from env side effects

pkg/git/git_test.go

@@ -1,7 +1,6 @@
 package git
 
 import (
-	"os"
 	"testing"
 
 	gitHttp "github.com/go-git/go-git/v5/plumbing/transport/http"
@@ -123,10 +122,10 @@ func TestGetGitAuth(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if tt.envToken != "" {
-				os.Setenv("GITHUB_TOKEN", tt.envToken)
-				defer os.Unsetenv("GITHUB_TOKEN")
-			}
+			// Important: Don't affect or be affected by the actual environment. This helps
+			// to make the test less flaky, and avoids disrupting the developer's local
+			// setup.
+			t.Setenv("GITHUB_TOKEN", tt.envToken)
 
 			auth, err := GetGitAuth(tt.gitURL)