git: Drop unused env parameter for SafeBareCmd()

Now that all callsites use `WithEnv()`, the `env` parameter of
`SafeBareCmd()` is unused, so let's drop it.

12 files changed, 24 insertions, 24 deletions

diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go
index b76da24d1..2a6b7e677 100644
--- a/cmd/gitaly-ssh/upload_pack_test.go
+++ b/cmd/gitaly-ssh/upload_pack_test.go
@@ -86,7 +86,7 @@ func TestVisibilityOfHiddenRefs(t *testing.T) {
 			}
 
 			stdout := &bytes.Buffer{}
-			cmd, err := git.SafeBareCmd(ctx, nil, nil, git.SubCmd{
+			cmd, err := git.SafeBareCmd(ctx, nil, git.SubCmd{
 				Name: "ls-remote",
 				Args: []string{
 					fmt.Sprintf("%s:%s", "git@localhost", testRepoPath),
diff --git a/internal/git/safecmd.go b/internal/git/safecmd.go
index af3536413..85adbc405 100644
--- a/internal/git/safecmd.go
+++ b/internal/git/safecmd.go
@@ -373,9 +373,9 @@ func SafeCmd(ctx context.Context, repo repository.GitRepo, globals []GlobalOptio
 	}, repo, args...)
 }
 
-// SafeBareCmd creates a git.Command with the given args and env. It
+// SafeBareCmd creates a git.Command with the given args. It
 // validates the arguments in the command before executing.
-func SafeBareCmd(ctx context.Context, env []string, globals []GlobalOption, sc Cmd, opts ...CmdOpt) (*command.Command, error) {
+func SafeBareCmd(ctx context.Context, globals []GlobalOption, sc Cmd, opts ...CmdOpt) (*command.Command, error) {
 	cc := &cmdCfg{}
 
 	if err := handleOpts(ctx, sc, cc, opts); err != nil {
@@ -391,11 +391,11 @@ func SafeBareCmd(ctx context.Context, env []string, globals []GlobalOption, sc C
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
-	}, append(env, cc.env...), args...)
+	}, cc.env, args...)
 }
 
 // SafeBareCmdInDir runs SafeBareCmd in the dir.
-func SafeBareCmdInDir(ctx context.Context, dir string, env []string, globals []GlobalOption, sc Cmd, opts ...CmdOpt) (*command.Command, error) {
+func SafeBareCmdInDir(ctx context.Context, dir string, globals []GlobalOption, sc Cmd, opts ...CmdOpt) (*command.Command, error) {
 	if dir == "" {
 		return nil, errors.New("no 'dir' provided")
 	}
@@ -415,7 +415,7 @@ func SafeBareCmdInDir(ctx context.Context, dir string, env []string, globals []G
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
-	}, append(env, cc.env...), args...)
+	}, cc.env, args...)
 }
 
 // SafeStdinCmd creates a git.Command with the given args and Repository that is
diff --git a/internal/git/safecmd_test.go b/internal/git/safecmd_test.go
index 4c39aae44..7981b4f56 100644
--- a/internal/git/safecmd_test.go
+++ b/internal/git/safecmd_test.go
@@ -344,7 +344,7 @@ func TestSafeCmdValid(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, tt.expectArgs, cmd.Args()[3:])
 
-			cmd, err = SafeBareCmd(ctx, nil, tt.globals, tt.subCmd, opts...)
+			cmd, err = SafeBareCmd(ctx, tt.globals, tt.subCmd, opts...)
 			require.NoError(t, err)
 			// ignore first indeterministic arg (executable path)
 			require.Equal(t, tt.expectArgs, cmd.Args()[1:])
@@ -353,7 +353,7 @@ func TestSafeCmdValid(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, tt.expectArgs, cmd.Args()[1:])
 
-			cmd, err = SafeBareCmdInDir(ctx, testRepoPath, nil, tt.globals, tt.subCmd, opts...)
+			cmd, err = SafeBareCmdInDir(ctx, testRepoPath, tt.globals, tt.subCmd, opts...)
 			require.NoError(t, err)
 			require.Equal(t, tt.expectArgs, cmd.Args()[1:])
 		})
@@ -384,7 +384,7 @@ func TestSafeBareCmdInDir(t *testing.T) {
 		defer cancel()
 
 		var stderr bytes.Buffer
-		cmd, err := SafeBareCmdInDir(ctx, repoPath, nil, nil, SubCmd{
+		cmd, err := SafeBareCmdInDir(ctx, repoPath, nil, SubCmd{
 			Name: "rev-parse",
 			Args: []string{"master"},
 		}, WithStderr(&stderr))
@@ -403,7 +403,7 @@ func TestSafeBareCmdInDir(t *testing.T) {
 		defer cancel()
 
 		var stderr bytes.Buffer
-		_, err := SafeBareCmdInDir(ctx, "non-existing-dir", nil, nil, SubCmd{
+		_, err := SafeBareCmdInDir(ctx, "non-existing-dir", nil, SubCmd{
 			Name: "rev-parse",
 			Args: []string{"master"},
 		}, WithStderr(&stderr))
diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go
index 1b423508b..a00d921bb 100644
--- a/internal/gitaly/service/operations/squash.go
+++ b/internal/gitaly/service/operations/squash.go
@@ -167,7 +167,7 @@ func (s *Server) runUserSquashGo(ctx context.Context, req *gitalypb.UserSquashRe
 
 func (s *Server) diffFiles(ctx context.Context, env []string, repoPath string, req *gitalypb.UserSquashRequest) ([]byte, error) {
 	var stdout, stderr bytes.Buffer
-	cmd, err := git.SafeBareCmd(ctx, nil,
+	cmd, err := git.SafeBareCmd(ctx,
 		[]git.GlobalOption{git.ValueFlag{Name: "--git-dir", Value: repoPath}},
 		git.SubCmd{
 			Name:  "diff",
@@ -246,7 +246,7 @@ func (s *Server) userSquashWithDiffInFiles(ctx context.Context, req *gitalypb.Us
 
 func (s *Server) checkout(ctx context.Context, repo *gitalypb.Repository, worktreePath string, req *gitalypb.UserSquashRequest) error {
 	var stderr bytes.Buffer
-	checkoutCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil,
+	checkoutCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil,
 		git.SubCmd{
 			Name:  "checkout",
 			Flags: []git.Option{git.Flag{Name: "--detach"}},
@@ -272,7 +272,7 @@ func (s *Server) checkout(ctx context.Context, repo *gitalypb.Repository, worktr
 
 func (s *Server) revParseGitDir(ctx context.Context, worktreePath string) (string, error) {
 	var stdout, stderr bytes.Buffer
-	cmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil,
+	cmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil,
 		git.SubCmd{
 			Name:  "rev-parse",
 			Flags: []git.Option{git.Flag{Name: "--git-dir"}},
@@ -391,7 +391,7 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	}
 
 	var applyStderr bytes.Buffer
-	cmdApply, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil,
+	cmdApply, err := git.SafeBareCmdInDir(ctx, worktreePath, nil,
 		git.SubCmd{
 			Name: "apply",
 			Flags: []git.Option{
@@ -428,7 +428,7 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	)
 
 	var commitStderr bytes.Buffer
-	cmdCommit, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil, git.SubCmd{
+	cmdCommit, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, git.SubCmd{
 		Name: "commit",
 		Flags: []git.Option{
 			git.Flag{Name: "--no-verify"},
@@ -445,7 +445,7 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	}
 
 	var revParseStdout, revParseStderr bytes.Buffer
-	revParseCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil, git.SubCmd{
+	revParseCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, git.SubCmd{
 		Name: "rev-parse",
 		Flags: []git.Option{
 			git.Flag{Name: "--quiet"},
diff --git a/internal/gitaly/service/repository/clone_from_pool_internal.go b/internal/gitaly/service/repository/clone_from_pool_internal.go
index 47d94be4f..0609c9d73 100644
--- a/internal/gitaly/service/repository/clone_from_pool_internal.go
+++ b/internal/gitaly/service/repository/clone_from_pool_internal.go
@@ -125,7 +125,7 @@ func (s *server) cloneFromPool(ctx context.Context, objectPoolRepo *gitalypb.Obj
 		return fmt.Errorf("expected *gitlaypb.Repository but got %T", repo)
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, nil,
+	cmd, err := git.SafeBareCmd(ctx, nil,
 		git.SubCmd{
 			Name:        "clone",
 			Flags:       []git.Option{git.Flag{Name: "--bare"}, git.Flag{Name: "--shared"}},
diff --git a/internal/gitaly/service/repository/create_from_url.go b/internal/gitaly/service/repository/create_from_url.go
index 62d7d4415..3bbbcab9c 100644
--- a/internal/gitaly/service/repository/create_from_url.go
+++ b/internal/gitaly/service/repository/create_from_url.go
@@ -47,7 +47,7 @@ func (s *server) cloneFromURLCommand(ctx context.Context, repo *gitalypb.Reposit
 		globalFlags = append(globalFlags, git.ConfigPair{Key: "http.extraHeader", Value: authHeader})
 	}
 
-	return git.SafeBareCmd(ctx, nil, globalFlags,
+	return git.SafeBareCmd(ctx, globalFlags,
 		git.SubCmd{
 			Name:        "clone",
 			Flags:       cloneFlags,
diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go
index 7c998f5b5..a9948fe7b 100644
--- a/internal/gitaly/service/repository/fork.go
+++ b/internal/gitaly/service/repository/fork.go
@@ -53,7 +53,7 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest
 		return nil, err
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, nil,
+	cmd, err := git.SafeBareCmd(ctx, nil,
 		git.SubCmd{
 			Name: "clone",
 			Flags: []git.Option{
diff --git a/internal/gitaly/service/smarthttp/inforefs.go b/internal/gitaly/service/smarthttp/inforefs.go
index e3afd2481..3b3646f8a 100644
--- a/internal/gitaly/service/smarthttp/inforefs.go
+++ b/internal/gitaly/service/smarthttp/inforefs.go
@@ -58,7 +58,7 @@ func (s *server) handleInfoRefs(ctx context.Context, service string, req *gitaly
 		globalOpts[i] = git.ValueFlag{"-c", o}
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, globalOpts, git.SubCmd{
+	cmd, err := git.SafeBareCmd(ctx, globalOpts, git.SubCmd{
 		Name:  service,
 		Flags: []git.Option{git.Flag{Name: "--stateless-rpc"}, git.Flag{Name: "--advertise-refs"}},
 		Args:  []string{repoPath},
diff --git a/internal/gitaly/service/smarthttp/receive_pack.go b/internal/gitaly/service/smarthttp/receive_pack.go
index f3f2bfb05..b7d46205a 100644
--- a/internal/gitaly/service/smarthttp/receive_pack.go
+++ b/internal/gitaly/service/smarthttp/receive_pack.go
@@ -48,7 +48,7 @@ func (s *server) PostReceivePack(stream gitalypb.SmartHTTPService_PostReceivePac
 		globalOpts[i] = git.ValueFlag{"-c", o}
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, globalOpts,
+	cmd, err := git.SafeBareCmd(ctx, globalOpts,
 		git.SubCmd{
 			Name:  "receive-pack",
 			Flags: []git.Option{git.Flag{Name: "--stateless-rpc"}},
diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go
index 6303e5e89..f57a84715 100644
--- a/internal/gitaly/service/smarthttp/upload_pack.go
+++ b/internal/gitaly/service/smarthttp/upload_pack.go
@@ -77,7 +77,7 @@ func (s *server) PostUploadPack(stream gitalypb.SmartHTTPService_PostUploadPackS
 		globalOpts[i] = git.ValueFlag{"-c", o}
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, globalOpts, git.SubCmd{
+	cmd, err := git.SafeBareCmd(ctx, globalOpts, git.SubCmd{
 		Name:  "upload-pack",
 		Flags: []git.Option{git.Flag{Name: "--stateless-rpc"}},
 		Args:  []string{repoPath},
diff --git a/internal/gitaly/service/ssh/monitor_stdin_command.go b/internal/gitaly/service/ssh/monitor_stdin_command.go
index 1005c3095..a21c4d223 100644
--- a/internal/gitaly/service/ssh/monitor_stdin_command.go
+++ b/internal/gitaly/service/ssh/monitor_stdin_command.go
@@ -16,7 +16,7 @@ func monitorStdinCommand(ctx context.Context, stdin io.Reader, stdout, stderr io
 		return nil, nil, fmt.Errorf("create monitor: %v", err)
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, globals, sc, append([]git.CmdOpt{
+	cmd, err := git.SafeBareCmd(ctx, globals, sc, append([]git.CmdOpt{
 		git.WithStdin(stdinPipe), git.WithStdout(stdout), git.WithStderr(stderr),
 	}, opts...)...)
 	stdinPipe.Close() // this now belongs to cmd
diff --git a/internal/gitaly/service/ssh/receive_pack.go b/internal/gitaly/service/ssh/receive_pack.go
index 4db9501ac..54a779894 100644
--- a/internal/gitaly/service/ssh/receive_pack.go
+++ b/internal/gitaly/service/ssh/receive_pack.go
@@ -66,7 +66,7 @@ func (s *server) sshReceivePack(stream gitalypb.SSHService_SSHReceivePackServer,
 		globalOpts[i] = git.ValueFlag{"-c", o}
 	}
 
-	cmd, err := git.SafeBareCmd(ctx, nil, globalOpts,
+	cmd, err := git.SafeBareCmd(ctx, globalOpts,
 		git.SubCmd{
 			Name: "receive-pack",
 			Args: []string{repoPath},