USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile error

release/0.12
Joe Chen 2023-02-25 13:05:41 +08:00
parent b1576d5a1f
commit 01917975f9
No known key found for this signature in database
GPG Key ID: 0BDE5280C552FF60
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/db/repo.go
View File

@ -1970,7 +1970,9 @@ func GitFsck() {
repo := bean.(*Repository) repo := bean.(*Repository)
repoPath := repo.RepoPath() repoPath := repo.RepoPath()
err := git.RepoFsck(repoPath, git.FsckOptions{ err := git.RepoFsck(repoPath, git.FsckOptions{
CommandOptions: git.CommandOptions{
Args: conf.Cron.RepoHealthCheck.Args, Args: conf.Cron.RepoHealthCheck.Args,
},
Timeout: conf.Cron.RepoHealthCheck.Timeout, Timeout: conf.Cron.RepoHealthCheck.Timeout,
}) })
if err != nil { if err != nil {

6
internal/db/repo_editor.go
View File

@ -197,7 +197,7 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
RepoName: repo.Name, RepoName: repo.Name,
RepoPath: repo.RepoPath(), 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 fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
} }
return nil return nil
@ -302,7 +302,7 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (
RepoName: repo.Name, RepoName: repo.Name,
RepoPath: repo.RepoPath(), 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 fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
} }
return nil return nil
@ -536,7 +536,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
RepoName: repo.Name, RepoName: repo.Name,
RepoPath: repo.RepoPath(), 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 fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
} }