git: Make `CmdStream` package-internal

Now that all external users of `CmdStream` have been converted to
instead use command options, we can now make the `CmdStream` type
internal to the "git" package.

4 files changed, 12 insertions, 12 deletions

diff --git a/internal/git/command.go b/internal/git/command.go
index d4c7e883a..72a7f8516 100644
--- a/internal/git/command.go
+++ b/internal/git/command.go
@@ -35,7 +35,7 @@ func (cf *CommandFactory) gitPath() string {
 }
 
 // unsafeCmdWithEnv creates a git.unsafeCmd with the given args, environment, and Repository
-func (cf *CommandFactory) unsafeCmdWithEnv(ctx context.Context, extraEnv []string, stream CmdStream, repo repository.GitRepo, args ...string) (*command.Command, error) {
+func (cf *CommandFactory) unsafeCmdWithEnv(ctx context.Context, extraEnv []string, stream cmdStream, repo repository.GitRepo, args ...string) (*command.Command, error) {
 	args, env, err := cf.argsAndEnv(repo, args...)
 	if err != nil {
 		return nil, err
@@ -56,7 +56,7 @@ func (cf *CommandFactory) unsafeStdinCmd(ctx context.Context, extraEnv []string,
 
 	env = append(env, extraEnv...)
 
-	return cf.unsafeBareCmd(ctx, CmdStream{In: command.SetupStdin}, env, args...)
+	return cf.unsafeBareCmd(ctx, cmdStream{In: command.SetupStdin}, env, args...)
 }
 
 func (cf *CommandFactory) argsAndEnv(repo repository.GitRepo, args ...string) ([]string, []string, error) {
@@ -72,7 +72,7 @@ func (cf *CommandFactory) argsAndEnv(repo repository.GitRepo, args ...string) ([
 }
 
 // unsafeBareCmd creates a git.Command with the given args, stdin/stdout/stderr, and env
-func (cf *CommandFactory) unsafeBareCmd(ctx context.Context, stream CmdStream, env []string, args ...string) (*command.Command, error) {
+func (cf *CommandFactory) unsafeBareCmd(ctx context.Context, stream cmdStream, env []string, args ...string) (*command.Command, error) {
 	env = append(env, command.GitEnv...)
 
 	cmd, err := command.New(ctx, exec.Command(cf.gitPath(), args...), stream.In, stream.Out, stream.Err, env...)
@@ -88,7 +88,7 @@ func (cf *CommandFactory) unsafeBareCmd(ctx context.Context, stream CmdStream, e
 }
 
 // unsafeBareCmdInDir calls unsafeBareCmd in dir.
-func (cf *CommandFactory) unsafeBareCmdInDir(ctx context.Context, dir string, stream CmdStream, env []string, args ...string) (*command.Command, error) {
+func (cf *CommandFactory) unsafeBareCmdInDir(ctx context.Context, dir string, stream cmdStream, env []string, args ...string) (*command.Command, error) {
 	env = append(env, command.GitEnv...)
 
 	cmd1 := exec.Command(cf.gitPath(), args...)
diff --git a/internal/git/command_test.go b/internal/git/command_test.go
index 1215fbbb1..55032a8de 100644
--- a/internal/git/command_test.go
+++ b/internal/git/command_test.go
@@ -29,7 +29,7 @@ func TestGitCommandProxy(t *testing.T) {
 	dir, cleanup := testhelper.TempDir(t)
 	defer cleanup()
 
-	cmd, err := NewCommandFactory().unsafeBareCmd(ctx, CmdStream{}, nil, "clone", "http://gitlab.com/bogus-repo", dir)
+	cmd, err := NewCommandFactory().unsafeBareCmd(ctx, cmdStream{}, nil, "clone", "http://gitlab.com/bogus-repo", dir)
 	require.NoError(t, err)
 
 	err = cmd.Wait()
diff --git a/internal/git/safecmd.go b/internal/git/safecmd.go
index ffcb0fb8d..62d3969aa 100644
--- a/internal/git/safecmd.go
+++ b/internal/git/safecmd.go
@@ -50,8 +50,8 @@ type SubCmd struct {
 	PostSepArgs []string // post separator (i.e. "--") positional args
 }
 
-// CmdStream represents standard input/output streams for a command
-type CmdStream struct {
+// cmdStream represents standard input/output streams for a command
+type cmdStream struct {
 	In       io.Reader // standard input
 	Out, Err io.Writer // standard output and error
 }
@@ -302,7 +302,7 @@ func SafeCmdWithEnv(ctx context.Context, env []string, repo repository.GitRepo,
 		return nil, err
 	}
 
-	return NewCommandFactory().unsafeCmdWithEnv(ctx, append(env, cc.env...), CmdStream{
+	return NewCommandFactory().unsafeCmdWithEnv(ctx, append(env, cc.env...), cmdStream{
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
@@ -323,7 +323,7 @@ func SafeBareCmd(ctx context.Context, env []string, globals []Option, sc Cmd, op
 		return nil, err
 	}
 
-	return NewCommandFactory().unsafeBareCmd(ctx, CmdStream{
+	return NewCommandFactory().unsafeBareCmd(ctx, cmdStream{
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
@@ -347,7 +347,7 @@ func SafeBareCmdInDir(ctx context.Context, dir string, env []string, globals []O
 		return nil, err
 	}
 
-	return NewCommandFactory().unsafeBareCmdInDir(ctx, dir, CmdStream{
+	return NewCommandFactory().unsafeBareCmdInDir(ctx, dir, cmdStream{
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
@@ -386,7 +386,7 @@ func SafeCmdWithoutRepo(ctx context.Context, globals []Option, sc SubCmd, opts .
 		return nil, err
 	}
 
-	return NewCommandFactory().unsafeBareCmd(ctx, CmdStream{
+	return NewCommandFactory().unsafeBareCmd(ctx, cmdStream{
 		In:  cc.stdin,
 		Out: cc.stdout,
 		Err: cc.stderr,
diff --git a/internal/git/version.go b/internal/git/version.go
index 87cf01126..6f6f4e4f3 100644
--- a/internal/git/version.go
+++ b/internal/git/version.go
@@ -21,7 +21,7 @@ type version struct {
 // Version returns the used git version.
 func Version(ctx context.Context) (string, error) {
 	var buf bytes.Buffer
-	cmd, err := NewCommandFactory().unsafeBareCmd(ctx, CmdStream{Out: &buf}, nil, "version")
+	cmd, err := NewCommandFactory().unsafeBareCmd(ctx, cmdStream{Out: &buf}, nil, "version")
 	if err != nil {
 		return "", err
 	}