lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug on refactoring (#13373)

release/v1.15
Lunny Xiao 2020-10-31 23:42:54 +08:00 committed by GitHub
parent 7cb22d6439
commit a420beda2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/repository/push.go
View File

@ -5,11 +5,10 @@
package repository package repository
import ( import (
"path/filepath"
"strings" "strings"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
) )
// PushUpdateOptions defines the push update options // PushUpdateOptions defines the push update options
@ -105,7 +104,7 @@ func IsForcePush(opts *PushUpdateOptions) (bool, error) {
} }
output, err := git.NewCommand("rev-list", "--max-count=1", opts.OldCommitID, "^"+opts.NewCommitID). output, err := git.NewCommand("rev-list", "--max-count=1", opts.OldCommitID, "^"+opts.NewCommitID).
RunInDir(filepath.Join(setting.RepoRootPath, opts.RepoUserName, opts.RepoName)) RunInDir(models.RepoPath(opts.RepoUserName, opts.RepoName))
if err != nil { if err != nil {
return false, err return false, err
} else if len(output) > 0 { } else if len(output) > 0 {

2
services/repository/push.go
View File

@ -138,7 +138,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
isForce, err := repo_module.IsForcePush(opts) isForce, err := repo_module.IsForcePush(opts)
if err != nil { if err != nil {
log.Error("isForcePush %s/%s failed: %v", repo.ID, branch, err) log.Error("isForcePush %s:%s failed: %v", repo.FullName(), branch, err)
} }
if isForce { if isForce {