diff options
Diffstat (limited to 'modules/git/git.go')
| -rw-r--r-- | modules/git/git.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/git/git.go b/modules/git/git.go index 6b7dbfd169..b97bb14900 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -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}) } |