git: Convert SafeBareCmd() invocations to use WithEnv()

With the newly introduced `WithEnv()` option, this commit converts all
useage of `SafeBareCmd()` with environment variables to use `WithEnv()`
instead.

3 files changed, 12 insertions, 9 deletions

diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go
index a31e63dee..b76da24d1 100644
--- a/cmd/gitaly-ssh/upload_pack_test.go
+++ b/cmd/gitaly-ssh/upload_pack_test.go
@@ -86,13 +86,13 @@ func TestVisibilityOfHiddenRefs(t *testing.T) {
 			}
 
 			stdout := &bytes.Buffer{}
-			cmd, err := git.SafeBareCmd(ctx, env, nil, git.SubCmd{
+			cmd, err := git.SafeBareCmd(ctx, nil, nil, git.SubCmd{
 				Name: "ls-remote",
 				Args: []string{
 					fmt.Sprintf("%s:%s", "git@localhost", testRepoPath),
 					keepAroundRef,
 				},
-			}, git.WithStdout(stdout))
+			}, git.WithEnv(env...), git.WithStdout(stdout))
 			require.NoError(t, err)
 
 			err = cmd.Wait()
diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go
index 1ab1c68dc..1b423508b 100644
--- a/internal/gitaly/service/operations/squash.go
+++ b/internal/gitaly/service/operations/squash.go
@@ -167,13 +167,14 @@ 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, env,
+	cmd, err := git.SafeBareCmd(ctx, nil,
 		[]git.GlobalOption{git.ValueFlag{Name: "--git-dir", Value: repoPath}},
 		git.SubCmd{
 			Name:  "diff",
 			Flags: []git.Option{git.Flag{Name: "--name-only"}, git.Flag{Name: "--diff-filter=ar"}, git.Flag{Name: "--binary"}},
 			Args:  []string{diffRange(req)},
 		},
+		git.WithEnv(env...),
 		git.WithStdout(&stdout),
 		git.WithStderr(&stderr),
 	)
@@ -390,7 +391,7 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	}
 
 	var applyStderr bytes.Buffer
-	cmdApply, err := git.SafeBareCmdInDir(ctx, worktreePath, env, nil,
+	cmdApply, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil,
 		git.SubCmd{
 			Name: "apply",
 			Flags: []git.Option{
@@ -399,6 +400,7 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 				git.Flag{Name: "--whitespace=nowarn"},
 			},
 		},
+		git.WithEnv(env...),
 		git.WithStdin(command.SetupStdin),
 		git.WithStderr(&applyStderr),
 	)
@@ -426,14 +428,14 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	)
 
 	var commitStderr bytes.Buffer
-	cmdCommit, err := git.SafeBareCmdInDir(ctx, worktreePath, commitEnv, nil, git.SubCmd{
+	cmdCommit, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil, git.SubCmd{
 		Name: "commit",
 		Flags: []git.Option{
 			git.Flag{Name: "--no-verify"},
 			git.Flag{Name: "--quiet"},
 			git.ValueFlag{Name: "--message", Value: string(req.GetCommitMessage())},
 		},
-	}, git.WithStderr(&commitStderr), git.WithRefTxHook(ctx, repo, s.cfg))
+	}, git.WithEnv(commitEnv...), git.WithStderr(&commitStderr), git.WithRefTxHook(ctx, repo, s.cfg))
 	if err != nil {
 		return "", fmt.Errorf("creation of 'git commit': %w", gitError{ErrMsg: commitStderr.String(), Err: err})
 	}
@@ -443,14 +445,14 @@ func (s *Server) applyDiff(ctx context.Context, repo *gitalypb.Repository, req *
 	}
 
 	var revParseStdout, revParseStderr bytes.Buffer
-	revParseCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, env, nil, git.SubCmd{
+	revParseCmd, err := git.SafeBareCmdInDir(ctx, worktreePath, nil, nil, git.SubCmd{
 		Name: "rev-parse",
 		Flags: []git.Option{
 			git.Flag{Name: "--quiet"},
 			git.Flag{Name: "--verify"},
 		},
 		Args: []string{"HEAD^{commit}"},
-	}, git.WithStdout(&revParseStdout), git.WithStderr(&revParseStderr))
+	}, git.WithEnv(env...), git.WithStdout(&revParseStdout), git.WithStderr(&revParseStderr))
 	if err != nil {
 		return "", fmt.Errorf("creation of 'git rev-parse': %w", gitError{ErrMsg: revParseStderr.String(), Err: err})
 	}
diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go
index 53c487ef6..7c998f5b5 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, env, nil,
+	cmd, err := git.SafeBareCmd(ctx, nil, nil,
 		git.SubCmd{
 			Name: "clone",
 			Flags: []git.Option{
@@ -65,6 +65,7 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest
 				targetRepositoryFullPath,
 			},
 		},
+		git.WithEnv(env...),
 		git.WithRefTxHook(ctx, req.Repository, s.cfg),
 	)
 	if err != nil {