Lunny Xiao
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
modules/repository/push.go
-
services/repository/push.go
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
