mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 13:28:25 +00:00 
			
		
		
		
	Refactor Git command functions to use WithXXX methods instead of exposing RunOpts. This change simplifies reuse across gitrepo and improves consistency, encapsulation, and maintainability of command options. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			489 lines
		
	
	
		
			16 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			489 lines
		
	
	
		
			16 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2015 The Gogs Authors. All rights reserved.
 | 
						|
// Copyright 2016 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package gitcmd
 | 
						|
 | 
						|
import (
 | 
						|
	"bytes"
 | 
						|
	"context"
 | 
						|
	"errors"
 | 
						|
	"fmt"
 | 
						|
	"io"
 | 
						|
	"os"
 | 
						|
	"os/exec"
 | 
						|
	"path/filepath"
 | 
						|
	"runtime"
 | 
						|
	"strings"
 | 
						|
	"time"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions
 | 
						|
	"code.gitea.io/gitea/modules/gtprof"
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	"code.gitea.io/gitea/modules/process"
 | 
						|
	"code.gitea.io/gitea/modules/util"
 | 
						|
)
 | 
						|
 | 
						|
// TrustedCmdArgs returns the trusted arguments for git command.
 | 
						|
// It's mainly for passing user-provided and trusted arguments to git command
 | 
						|
// In most cases, it shouldn't be used. Use AddXxx function instead
 | 
						|
type TrustedCmdArgs []internal.CmdArg
 | 
						|
 | 
						|
// defaultCommandExecutionTimeout default command execution timeout duration
 | 
						|
var defaultCommandExecutionTimeout = 360 * time.Second
 | 
						|
 | 
						|
func SetDefaultCommandExecutionTimeout(timeout time.Duration) {
 | 
						|
	defaultCommandExecutionTimeout = timeout
 | 
						|
}
 | 
						|
 | 
						|
// DefaultLocale is the default LC_ALL to run git commands in.
 | 
						|
const DefaultLocale = "C"
 | 
						|
 | 
						|
// Command represents a command with its subcommands or arguments.
 | 
						|
type Command struct {
 | 
						|
	prog       string
 | 
						|
	args       []string
 | 
						|
	brokenArgs []string
 | 
						|
	cmd        *exec.Cmd // for debug purpose only
 | 
						|
	configArgs []string
 | 
						|
	opts       runOpts
 | 
						|
}
 | 
						|
 | 
						|
func logArgSanitize(arg string) string {
 | 
						|
	if strings.Contains(arg, "://") && strings.Contains(arg, "@") {
 | 
						|
		return util.SanitizeCredentialURLs(arg)
 | 
						|
	} else if filepath.IsAbs(arg) {
 | 
						|
		base := filepath.Base(arg)
 | 
						|
		dir := filepath.Dir(arg)
 | 
						|
		return ".../" + filepath.Join(filepath.Base(dir), base)
 | 
						|
	}
 | 
						|
	return arg
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) LogString() string {
 | 
						|
	// WARNING: this function is for debugging purposes only. It's much better than old code (which only joins args with space),
 | 
						|
	// It's impossible to make a simple and 100% correct implementation of argument quoting for different platforms here.
 | 
						|
	debugQuote := func(s string) string {
 | 
						|
		if strings.ContainsAny(s, " `'\"\t\r\n") {
 | 
						|
			return fmt.Sprintf("%q", s)
 | 
						|
		}
 | 
						|
		return s
 | 
						|
	}
 | 
						|
	a := make([]string, 0, len(c.args)+1)
 | 
						|
	a = append(a, debugQuote(c.prog))
 | 
						|
	for i := 0; i < len(c.args); i++ {
 | 
						|
		a = append(a, debugQuote(logArgSanitize(c.args[i])))
 | 
						|
	}
 | 
						|
	return strings.Join(a, " ")
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) ProcessState() string {
 | 
						|
	if c.cmd == nil {
 | 
						|
		return ""
 | 
						|
	}
 | 
						|
	return c.cmd.ProcessState.String()
 | 
						|
}
 | 
						|
 | 
						|
// NewCommand creates and returns a new Git Command based on given command and arguments.
 | 
						|
// Each argument should be safe to be trusted. User-provided arguments should be passed to AddDynamicArguments instead.
 | 
						|
func NewCommand(args ...internal.CmdArg) *Command {
 | 
						|
	cargs := make([]string, 0, len(args))
 | 
						|
	for _, arg := range args {
 | 
						|
		cargs = append(cargs, string(arg))
 | 
						|
	}
 | 
						|
	return &Command{
 | 
						|
		prog: GitExecutable,
 | 
						|
		args: cargs,
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
// isSafeArgumentValue checks if the argument is safe to be used as a value (not an option)
 | 
						|
func isSafeArgumentValue(s string) bool {
 | 
						|
	return s == "" || s[0] != '-'
 | 
						|
}
 | 
						|
 | 
						|
// isValidArgumentOption checks if the argument is a valid option (starting with '-').
 | 
						|
// It doesn't check whether the option is supported or not
 | 
						|
func isValidArgumentOption(s string) bool {
 | 
						|
	return s != "" && s[0] == '-'
 | 
						|
}
 | 
						|
 | 
						|
// AddArguments adds new git arguments (option/value) to the command. It only accepts string literals, or trusted CmdArg.
 | 
						|
// Type CmdArg is in the internal package, so it can not be used outside of this package directly,
 | 
						|
// it makes sure that user-provided arguments won't cause RCE risks.
 | 
						|
// User-provided arguments should be passed by other AddXxx functions
 | 
						|
func (c *Command) AddArguments(args ...internal.CmdArg) *Command {
 | 
						|
	for _, arg := range args {
 | 
						|
		c.args = append(c.args, string(arg))
 | 
						|
	}
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// AddOptionValues adds a new option with a list of non-option values
 | 
						|
// For example: AddOptionValues("--opt", val) means 2 arguments: {"--opt", val}.
 | 
						|
// The values are treated as dynamic argument values. It equals to: AddArguments("--opt") then AddDynamicArguments(val).
 | 
						|
func (c *Command) AddOptionValues(opt internal.CmdArg, args ...string) *Command {
 | 
						|
	if !isValidArgumentOption(string(opt)) {
 | 
						|
		c.brokenArgs = append(c.brokenArgs, string(opt))
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	c.args = append(c.args, string(opt))
 | 
						|
	c.AddDynamicArguments(args...)
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// AddOptionFormat adds a new option with a format string and arguments
 | 
						|
// For example: AddOptionFormat("--opt=%s %s", val1, val2) means 1 argument: {"--opt=val1 val2"}.
 | 
						|
func (c *Command) AddOptionFormat(opt string, args ...any) *Command {
 | 
						|
	if !isValidArgumentOption(opt) {
 | 
						|
		c.brokenArgs = append(c.brokenArgs, opt)
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	// a quick check to make sure the format string matches the number of arguments, to find low-level mistakes ASAP
 | 
						|
	if strings.Count(strings.ReplaceAll(opt, "%%", ""), "%") != len(args) {
 | 
						|
		c.brokenArgs = append(c.brokenArgs, opt)
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	s := fmt.Sprintf(opt, args...)
 | 
						|
	c.args = append(c.args, s)
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// AddDynamicArguments adds new dynamic argument values to the command.
 | 
						|
// The arguments may come from user input and can not be trusted, so no leading '-' is allowed to avoid passing options.
 | 
						|
// TODO: in the future, this function can be renamed to AddArgumentValues
 | 
						|
func (c *Command) AddDynamicArguments(args ...string) *Command {
 | 
						|
	for _, arg := range args {
 | 
						|
		if !isSafeArgumentValue(arg) {
 | 
						|
			c.brokenArgs = append(c.brokenArgs, arg)
 | 
						|
		}
 | 
						|
	}
 | 
						|
	if len(c.brokenArgs) != 0 {
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	c.args = append(c.args, args...)
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// AddDashesAndList adds the "--" and then add the list as arguments, it's usually for adding file list
 | 
						|
// At the moment, this function can be only called once, maybe in future it can be refactored to support multiple calls (if necessary)
 | 
						|
func (c *Command) AddDashesAndList(list ...string) *Command {
 | 
						|
	c.args = append(c.args, "--")
 | 
						|
	// Some old code also checks `arg != ""`, IMO it's not necessary.
 | 
						|
	// If the check is needed, the list should be prepared before the call to this function
 | 
						|
	c.args = append(c.args, list...)
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) AddConfig(key, value string) *Command {
 | 
						|
	kv := key + "=" + value
 | 
						|
	if !isSafeArgumentValue(kv) {
 | 
						|
		c.brokenArgs = append(c.brokenArgs, key)
 | 
						|
	} else {
 | 
						|
		c.configArgs = append(c.configArgs, "-c", kv)
 | 
						|
	}
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// ToTrustedCmdArgs converts a list of strings (trusted as argument) to TrustedCmdArgs
 | 
						|
// In most cases, it shouldn't be used. Use NewCommand().AddXxx() function instead
 | 
						|
func ToTrustedCmdArgs(args []string) TrustedCmdArgs {
 | 
						|
	ret := make(TrustedCmdArgs, len(args))
 | 
						|
	for i, arg := range args {
 | 
						|
		ret[i] = internal.CmdArg(arg)
 | 
						|
	}
 | 
						|
	return ret
 | 
						|
}
 | 
						|
 | 
						|
// runOpts represents parameters to run the command. If UseContextTimeout is specified, then Timeout is ignored.
 | 
						|
type runOpts struct {
 | 
						|
	Env               []string
 | 
						|
	Timeout           time.Duration
 | 
						|
	UseContextTimeout bool
 | 
						|
 | 
						|
	// Dir is the working dir for the git command, however:
 | 
						|
	// FIXME: this could be incorrect in many cases, for example:
 | 
						|
	// * /some/path/.git
 | 
						|
	// * /some/path/.git/gitea-data/data/repositories/user/repo.git
 | 
						|
	// If "user/repo.git" is invalid/broken, then running git command in it will use "/some/path/.git", and produce unexpected results
 | 
						|
	// The correct approach is to use `--git-dir" global argument
 | 
						|
	Dir string
 | 
						|
 | 
						|
	Stdout, Stderr io.Writer
 | 
						|
 | 
						|
	// Stdin is used for passing input to the command
 | 
						|
	// The caller must make sure the Stdin writer is closed properly to finish the Run function.
 | 
						|
	// Otherwise, the Run function may hang for long time or forever, especially when the Git's context deadline is not the same as the caller's.
 | 
						|
	// Some common mistakes:
 | 
						|
	// * `defer stdinWriter.Close()` then call `cmd.Run()`: the Run() would never return if the command is killed by timeout
 | 
						|
	// * `go { case <- parentContext.Done(): stdinWriter.Close() }` with `cmd.Run(DefaultTimeout)`: the command would have been killed by timeout but the Run doesn't return until stdinWriter.Close()
 | 
						|
	// * `go { if stdoutReader.Read() err != nil: stdinWriter.Close() }` with `cmd.Run()`: the stdoutReader may never return error if the command is killed by timeout
 | 
						|
	// In the future, ideally the git module itself should have full control of the stdin, to avoid such problems and make it easier to refactor to a better architecture.
 | 
						|
	Stdin io.Reader
 | 
						|
 | 
						|
	PipelineFunc func(context.Context, context.CancelFunc) error
 | 
						|
 | 
						|
	callerInfo string
 | 
						|
}
 | 
						|
 | 
						|
func commonBaseEnvs() []string {
 | 
						|
	envs := []string{
 | 
						|
		// Make Gitea use internal git config only, to prevent conflicts with user's git config
 | 
						|
		// It's better to use GIT_CONFIG_GLOBAL, but it requires git >= 2.32, so we still use HOME at the moment.
 | 
						|
		"HOME=" + HomeDir(),
 | 
						|
		// Avoid using system git config, it would cause problems (eg: use macOS osxkeychain to show a modal dialog, auto installing lfs hooks)
 | 
						|
		// This might be a breaking change in 1.24, because some users said that they have put some configs like "receive.certNonceSeed" in "/etc/gitconfig"
 | 
						|
		// For these users, they need to migrate the necessary configs to Gitea's git config file manually.
 | 
						|
		"GIT_CONFIG_NOSYSTEM=1",
 | 
						|
		// Ignore replace references (https://git-scm.com/docs/git-replace)
 | 
						|
		"GIT_NO_REPLACE_OBJECTS=1",
 | 
						|
	}
 | 
						|
 | 
						|
	// some environment variables should be passed to git command
 | 
						|
	passThroughEnvKeys := []string{
 | 
						|
		"GNUPGHOME", // git may call gnupg to do commit signing
 | 
						|
	}
 | 
						|
	for _, key := range passThroughEnvKeys {
 | 
						|
		if val, ok := os.LookupEnv(key); ok {
 | 
						|
			envs = append(envs, key+"="+val)
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return envs
 | 
						|
}
 | 
						|
 | 
						|
// CommonGitCmdEnvs returns the common environment variables for a "git" command.
 | 
						|
func CommonGitCmdEnvs() []string {
 | 
						|
	return append(commonBaseEnvs(), []string{
 | 
						|
		"LC_ALL=" + DefaultLocale,
 | 
						|
		"GIT_TERMINAL_PROMPT=0", // avoid prompting for credentials interactively, supported since git v2.3
 | 
						|
	}...)
 | 
						|
}
 | 
						|
 | 
						|
// CommonCmdServEnvs is like CommonGitCmdEnvs, but it only returns minimal required environment variables for the "gitea serv" command
 | 
						|
func CommonCmdServEnvs() []string {
 | 
						|
	return commonBaseEnvs()
 | 
						|
}
 | 
						|
 | 
						|
var ErrBrokenCommand = errors.New("git command is broken")
 | 
						|
 | 
						|
func (c *Command) WithDir(dir string) *Command {
 | 
						|
	c.opts.Dir = dir
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithEnv(env []string) *Command {
 | 
						|
	c.opts.Env = env
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithTimeout(timeout time.Duration) *Command {
 | 
						|
	c.opts.Timeout = timeout
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithStdout(stdout io.Writer) *Command {
 | 
						|
	c.opts.Stdout = stdout
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithStderr(stderr io.Writer) *Command {
 | 
						|
	c.opts.Stderr = stderr
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithStdin(stdin io.Reader) *Command {
 | 
						|
	c.opts.Stdin = stdin
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithPipelineFunc(f func(context.Context, context.CancelFunc) error) *Command {
 | 
						|
	c.opts.PipelineFunc = f
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) WithUseContextTimeout(useContextTimeout bool) *Command {
 | 
						|
	c.opts.UseContextTimeout = useContextTimeout
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// WithParentCallerInfo can be used to set the caller info (usually function name) of the parent function of the caller.
 | 
						|
// For most cases, "Run" family functions can get its caller info automatically
 | 
						|
// But if you need to call "Run" family functions in a wrapper function: "FeatureFunc -> GeneralWrapperFunc -> RunXxx",
 | 
						|
// then you can to call this function in GeneralWrapperFunc to set the caller info of FeatureFunc.
 | 
						|
// The caller info can only be set once.
 | 
						|
func (c *Command) WithParentCallerInfo(optInfo ...string) *Command {
 | 
						|
	if c.opts.callerInfo != "" {
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	if len(optInfo) > 0 {
 | 
						|
		c.opts.callerInfo = optInfo[0]
 | 
						|
		return c
 | 
						|
	}
 | 
						|
	skip := 1 /*parent "wrap/run" functions*/ + 1 /*this function*/
 | 
						|
	callerFuncName := util.CallerFuncName(skip)
 | 
						|
	callerInfo := callerFuncName
 | 
						|
	if pos := strings.LastIndex(callerInfo, "/"); pos >= 0 {
 | 
						|
		callerInfo = callerInfo[pos+1:]
 | 
						|
	}
 | 
						|
	c.opts.callerInfo = callerInfo
 | 
						|
	return c
 | 
						|
}
 | 
						|
 | 
						|
// Run runs the command
 | 
						|
func (c *Command) Run(ctx context.Context) error {
 | 
						|
	if len(c.brokenArgs) != 0 {
 | 
						|
		log.Error("git command is broken: %s, broken args: %s", c.LogString(), strings.Join(c.brokenArgs, " "))
 | 
						|
		return ErrBrokenCommand
 | 
						|
	}
 | 
						|
 | 
						|
	// We must not change the provided options
 | 
						|
	timeout := c.opts.Timeout
 | 
						|
	if timeout <= 0 {
 | 
						|
		timeout = defaultCommandExecutionTimeout
 | 
						|
	}
 | 
						|
 | 
						|
	cmdLogString := c.LogString()
 | 
						|
	if c.opts.callerInfo == "" {
 | 
						|
		c.WithParentCallerInfo()
 | 
						|
	}
 | 
						|
	// these logs are for debugging purposes only, so no guarantee of correctness or stability
 | 
						|
	desc := fmt.Sprintf("git.Run(by:%s, repo:%s): %s", c.opts.callerInfo, logArgSanitize(c.opts.Dir), cmdLogString)
 | 
						|
	log.Debug("git.Command: %s", desc)
 | 
						|
 | 
						|
	_, span := gtprof.GetTracer().Start(ctx, gtprof.TraceSpanGitRun)
 | 
						|
	defer span.End()
 | 
						|
	span.SetAttributeString(gtprof.TraceAttrFuncCaller, c.opts.callerInfo)
 | 
						|
	span.SetAttributeString(gtprof.TraceAttrGitCommand, cmdLogString)
 | 
						|
 | 
						|
	var cancel context.CancelFunc
 | 
						|
	var finished context.CancelFunc
 | 
						|
 | 
						|
	if c.opts.UseContextTimeout {
 | 
						|
		ctx, cancel, finished = process.GetManager().AddContext(ctx, desc)
 | 
						|
	} else {
 | 
						|
		ctx, cancel, finished = process.GetManager().AddContextTimeout(ctx, timeout, desc)
 | 
						|
	}
 | 
						|
	defer finished()
 | 
						|
 | 
						|
	startTime := time.Now()
 | 
						|
 | 
						|
	cmd := exec.CommandContext(ctx, c.prog, append(c.configArgs, c.args...)...)
 | 
						|
	c.cmd = cmd // for debug purpose only
 | 
						|
	if c.opts.Env == nil {
 | 
						|
		cmd.Env = os.Environ()
 | 
						|
	} else {
 | 
						|
		cmd.Env = c.opts.Env
 | 
						|
	}
 | 
						|
 | 
						|
	process.SetSysProcAttribute(cmd)
 | 
						|
	cmd.Env = append(cmd.Env, CommonGitCmdEnvs()...)
 | 
						|
	cmd.Dir = c.opts.Dir
 | 
						|
	cmd.Stdout = c.opts.Stdout
 | 
						|
	cmd.Stderr = c.opts.Stderr
 | 
						|
	cmd.Stdin = c.opts.Stdin
 | 
						|
	if err := cmd.Start(); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
 | 
						|
	if c.opts.PipelineFunc != nil {
 | 
						|
		err := c.opts.PipelineFunc(ctx, cancel)
 | 
						|
		if err != nil {
 | 
						|
			cancel()
 | 
						|
			_ = cmd.Wait()
 | 
						|
			return err
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	err := cmd.Wait()
 | 
						|
	elapsed := time.Since(startTime)
 | 
						|
	if elapsed > time.Second {
 | 
						|
		log.Debug("slow git.Command.Run: %s (%s)", c, elapsed)
 | 
						|
	}
 | 
						|
 | 
						|
	// We need to check if the context is canceled by the program on Windows.
 | 
						|
	// This is because Windows does not have signal checking when terminating the process.
 | 
						|
	// It always returns exit code 1, unlike Linux, which has many exit codes for signals.
 | 
						|
	// `err.Error()` returns "exit status 1" when using the `git check-attr` command after the context is canceled.
 | 
						|
	if runtime.GOOS == "windows" &&
 | 
						|
		err != nil &&
 | 
						|
		(err.Error() == "" || err.Error() == "exit status 1") &&
 | 
						|
		cmd.ProcessState.ExitCode() == 1 &&
 | 
						|
		ctx.Err() == context.Canceled {
 | 
						|
		return ctx.Err()
 | 
						|
	}
 | 
						|
 | 
						|
	if err != nil && ctx.Err() != context.DeadlineExceeded {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
 | 
						|
	return ctx.Err()
 | 
						|
}
 | 
						|
 | 
						|
type RunStdError interface {
 | 
						|
	error
 | 
						|
	Unwrap() error
 | 
						|
	Stderr() string
 | 
						|
}
 | 
						|
 | 
						|
type runStdError struct {
 | 
						|
	err    error
 | 
						|
	stderr string
 | 
						|
	errMsg string
 | 
						|
}
 | 
						|
 | 
						|
func (r *runStdError) Error() string {
 | 
						|
	// FIXME: GIT-CMD-STDERR: it is a bad design, the stderr should not be put in the error message
 | 
						|
	// But a lof of code only checks `strings.Contains(err.Error(), "git error")`
 | 
						|
	if r.errMsg == "" {
 | 
						|
		r.errMsg = ConcatenateError(r.err, r.stderr).Error()
 | 
						|
	}
 | 
						|
	return r.errMsg
 | 
						|
}
 | 
						|
 | 
						|
func (r *runStdError) Unwrap() error {
 | 
						|
	return r.err
 | 
						|
}
 | 
						|
 | 
						|
func (r *runStdError) Stderr() string {
 | 
						|
	return r.stderr
 | 
						|
}
 | 
						|
 | 
						|
func IsErrorExitCode(err error, code int) bool {
 | 
						|
	var exitError *exec.ExitError
 | 
						|
	if errors.As(err, &exitError) {
 | 
						|
		return exitError.ExitCode() == code
 | 
						|
	}
 | 
						|
	return false
 | 
						|
}
 | 
						|
 | 
						|
// RunStdString runs the command and returns stdout/stderr as string. and store stderr to returned error (err combined with stderr).
 | 
						|
func (c *Command) RunStdString(ctx context.Context) (stdout, stderr string, runErr RunStdError) {
 | 
						|
	stdoutBytes, stderrBytes, runErr := c.WithParentCallerInfo().runStdBytes(ctx)
 | 
						|
	return util.UnsafeBytesToString(stdoutBytes), util.UnsafeBytesToString(stderrBytes), runErr
 | 
						|
}
 | 
						|
 | 
						|
// RunStdBytes runs the command and returns stdout/stderr as bytes. and store stderr to returned error (err combined with stderr).
 | 
						|
func (c *Command) RunStdBytes(ctx context.Context) (stdout, stderr []byte, runErr RunStdError) {
 | 
						|
	return c.WithParentCallerInfo().runStdBytes(ctx)
 | 
						|
}
 | 
						|
 | 
						|
func (c *Command) runStdBytes(ctx context.Context) ( /*stdout*/ []byte /*stderr*/, []byte /*runErr*/, RunStdError) {
 | 
						|
	if c.opts.Stdout != nil || c.opts.Stderr != nil {
 | 
						|
		// we must panic here, otherwise there would be bugs if developers set Stdin/Stderr by mistake, and it would be very difficult to debug
 | 
						|
		panic("stdout and stderr field must be nil when using RunStdBytes")
 | 
						|
	}
 | 
						|
	stdoutBuf := &bytes.Buffer{}
 | 
						|
	stderrBuf := &bytes.Buffer{}
 | 
						|
	err := c.WithParentCallerInfo().
 | 
						|
		WithStdout(stdoutBuf).
 | 
						|
		WithStderr(stderrBuf).
 | 
						|
		Run(ctx)
 | 
						|
	if err != nil {
 | 
						|
		// FIXME: GIT-CMD-STDERR: it is a bad design, the stderr should not be put in the error message
 | 
						|
		// But a lot of code depends on it, so we have to keep this behavior
 | 
						|
		return nil, stderrBuf.Bytes(), &runStdError{err: err, stderr: util.UnsafeBytesToString(stderrBuf.Bytes())}
 | 
						|
	}
 | 
						|
	// even if there is no err, there could still be some stderr output
 | 
						|
	return stdoutBuf.Bytes(), stderrBuf.Bytes(), nil
 | 
						|
}
 |