mirror of
https://github.com/go-gitea/gitea
synced 2025-07-09 12:07:20 +00:00
Remove git.Command.Run
and git.Command.RunInDir*
(#19280)
Follows #19266, #8553, Close #18553, now there are only three `Run..(&RunOpts{})` functions. * before: `stdout, err := RunInDir(path)` * now: `stdout, _, err := RunStdString(&git.RunOpts{Dir:path})`
This commit is contained in:
@ -54,9 +54,9 @@ func LoadGitVersion() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
stdout, err := NewCommand(context.Background(), "version").Run()
|
||||
if err != nil {
|
||||
return err
|
||||
stdout, _, runErr := NewCommand(context.Background(), "version").RunStdString(nil)
|
||||
if runErr != nil {
|
||||
return runErr
|
||||
}
|
||||
|
||||
fields := strings.Fields(stdout)
|
||||
@ -74,6 +74,7 @@ func LoadGitVersion() error {
|
||||
versionString = fields[2]
|
||||
}
|
||||
|
||||
var err error
|
||||
gitVersion, err = version.NewVersion(versionString)
|
||||
return err
|
||||
}
|
||||
@ -297,5 +298,5 @@ func checkAndRemoveConfig(key, value string) error {
|
||||
|
||||
// Fsck verifies the connectivity and validity of the objects in the database
|
||||
func Fsck(ctx context.Context, repoPath string, timeout time.Duration, args ...string) error {
|
||||
return NewCommand(ctx, "fsck").AddArguments(args...).RunWithContext(&RunContext{Timeout: timeout, Dir: repoPath})
|
||||
return NewCommand(ctx, "fsck").AddArguments(args...).Run(&RunOpts{Timeout: timeout, Dir: repoPath})
|
||||
}
|
||||
|
Reference in New Issue
Block a user