From b8ab23910827fd77f38be5cc6ba958837f906e78 Mon Sep 17 00:00:00 2001
From: Adam Hegyi <ahegyi@gitlab.com>
Date: Wed, 25 Sep 2019 15:07:04 +0200
Subject: [PATCH] Use os.Environ() for git-linguist

---
 internal/linguist/linguist.go | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/internal/linguist/linguist.go b/internal/linguist/linguist.go
index 419f2299353..8744ddc47f6 100644
--- a/internal/linguist/linguist.go
+++ b/internal/linguist/linguist.go
@@ -19,8 +19,6 @@ func init() {
 	config.RegisterHook(LoadColors)
 }
 
-var exportedEnvVars = []string{"HOME", "PATH", "GEM_HOME", "BUNDLE_PATH", "BUNDLE_APP_CONFIG"}
-
 var (
 	colorMap = make(map[string]Language)
 )
@@ -106,8 +104,7 @@ func startGitLinguist(ctx context.Context, repoPath string, commitID string, lin
 	cmd := exec.Command("bundle", "exec", "bin/ruby-cd", repoPath, "git-linguist", "--commit="+commitID, linguistCommand)
 	cmd.Dir = config.Config.Ruby.Dir
 
-	var env []string
-	reader, err := command.New(ctx, cmd, nil, nil, nil, exportEnvironment(env)...)
+	reader, err := command.New(ctx, cmd, nil, nil, nil, os.Environ()...)
 	if err != nil {
 		return nil, err
 	}
@@ -154,13 +151,3 @@ func openLanguagesJSON(cfg config.Cfg) (io.ReadCloser, error) {
 
 	return os.Open(path.Join(linguistPathSymlink.Name(), "lib/linguist/languages.json"))
 }
-
-func exportEnvironment(env []string) []string {
-	for _, envVarName := range exportedEnvVars {
-		if val, ok := os.LookupEnv(envVarName); ok {
-			env = append(env, fmt.Sprintf("%s=%s", envVarName, val))
-		}
-	}
-
-	return env
-}
-- 
GitLab