diff --git a/internal/db/repo.go b/internal/db/repo.go index 6a7107178..c697bc3a8 100644 --- a/internal/db/repo.go +++ b/internal/db/repo.go @@ -1970,7 +1970,9 @@ func GitFsck() { repo := bean.(*Repository) repoPath := repo.RepoPath() err := git.RepoFsck(repoPath, git.FsckOptions{ - Args: conf.Cron.RepoHealthCheck.Args, + CommandOptions: git.CommandOptions{ + Args: conf.Cron.RepoHealthCheck.Args, + }, Timeout: conf.Cron.RepoHealthCheck.Timeout, }) if err != nil { diff --git a/internal/db/repo_editor.go b/internal/db/repo_editor.go index 754e4d22f..f61fc769a 100644 --- a/internal/db/repo_editor.go +++ b/internal/db/repo_editor.go @@ -197,7 +197,7 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) ( RepoName: repo.Name, RepoPath: repo.RepoPath(), }) - if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{Envs: envs}); err != nil { + if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{CommandOptions: git.CommandOptions{Envs: envs}}); err != nil { return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err) } return nil @@ -302,7 +302,7 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) ( RepoName: repo.Name, RepoPath: repo.RepoPath(), }) - if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{Envs: envs}); err != nil { + if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{CommandOptions: git.CommandOptions{Envs: envs}}); err != nil { return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err) } return nil @@ -536,7 +536,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions) RepoName: repo.Name, RepoPath: repo.RepoPath(), }) - if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{Envs: envs}); err != nil { + if err = git.RepoPush(localPath, "origin", opts.NewBranch, git.PushOptions{CommandOptions: git.CommandOptions{Envs: envs}}); err != nil { return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err) }