Browse Source

Fix a bug on refactoring (#13373)

tags/v1.15.0-dev
Lunny Xiao 3 years ago
parent
commit
a420beda2a
No account linked to committer's email address
2 changed files with 3 additions and 4 deletions
  1. 2
    3
      modules/repository/push.go
  2. 1
    1
      services/repository/push.go

+ 2
- 3
modules/repository/push.go View File

@@ -5,11 +5,10 @@
package repository

import (
"path/filepath"
"strings"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
)

// 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).
RunInDir(filepath.Join(setting.RepoRootPath, opts.RepoUserName, opts.RepoName))
RunInDir(models.RepoPath(opts.RepoUserName, opts.RepoName))
if err != nil {
return false, err
} else if len(output) > 0 {

+ 1
- 1
services/repository/push.go View File

@@ -138,7 +138,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {

isForce, err := repo_module.IsForcePush(opts)
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 {

Loading…
Cancel
Save