diff options
| author | mscherer <mscherer@users.noreply.github.com> | 2021-12-02 08:28:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 15:28:08 +0800 |
| commit | 34b5436ae1af2735546bb519a950eabf4990212d (patch) | |
| tree | 12953d3ad1915baba2ba0f59ddb1a5a4357668fc /services | |
| parent | ba57e30f13906ad7104da7892dc3dc79721ed2fe (diff) | |
| download | gitea-34b5436ae1af2735546bb519a950eabf4990212d.tar.gz gitea-34b5436ae1af2735546bb519a950eabf4990212d.zip | |
Refactor various strings (#17784)
Fixes #16478
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/mirror/mirror_pull.go | 4 | ||||
| -rw-r--r-- | services/pull/merge.go | 4 | ||||
| -rw-r--r-- | services/pull/pull.go | 4 | ||||
| -rw-r--r-- | services/repository/branch.go | 4 | ||||
| -rw-r--r-- | services/repository/files/temp_repo.go | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 9c8897fe79..7a2bc125c5 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -403,7 +403,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool { for _, result := range results { // Discard GitHub pull requests, i.e. refs/pull/* - if strings.HasPrefix(result.refName, "refs/pull/") { + if strings.HasPrefix(result.refName, git.PullPrefix) { continue } @@ -499,7 +499,7 @@ func checkAndUpdateEmptyRepository(m *models.Mirror, gitRepo *git.Repository, re } firstName := "" for _, result := range results { - if strings.HasPrefix(result.refName, "refs/pull/") { + if strings.HasPrefix(result.refName, git.PullPrefix) { continue } tp, name := git.SplitRefName(result.refName) diff --git a/services/pull/merge.go b/services/pull/merge.go index 007e919537..75c089eee8 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -421,9 +421,9 @@ func rawMerge(pr *models.PullRequest, doer *user_model.User, mergeStyle models.M var pushCmd *git.Command if mergeStyle == models.MergeStyleRebaseUpdate { // force push the rebase result to head brach - pushCmd = git.NewCommand("push", "-f", "head_repo", stagingBranch+":refs/heads/"+pr.HeadBranch) + pushCmd = git.NewCommand("push", "-f", "head_repo", stagingBranch+":"+git.BranchPrefix+pr.HeadBranch) } else { - pushCmd = git.NewCommand("push", "origin", baseBranch+":refs/heads/"+pr.BaseBranch) + pushCmd = git.NewCommand("push", "origin", baseBranch+":"+git.BranchPrefix+pr.BaseBranch) } // Push back to upstream. diff --git a/services/pull/pull.go b/services/pull/pull.go index afbdf1ce25..8bfe20c80e 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -451,8 +451,8 @@ func pushToBaseRepoHelper(pr *models.PullRequest, prefixHeadBranch string) (err log.Info("Can't push with %s%s", prefixHeadBranch, pr.HeadBranch) return err } - log.Info("Retrying to push with refs/heads/%s", pr.HeadBranch) - err = pushToBaseRepoHelper(pr, "refs/heads/") + log.Info("Retrying to push with "+git.BranchPrefix+"%s", pr.HeadBranch) + err = pushToBaseRepoHelper(pr, git.BranchPrefix) return err } log.Error("Unable to push PR head for %s#%d (%-v:%s) due to Error: %v", pr.BaseRepo.FullName(), pr.Index, pr.BaseRepo, gitRefName, err) diff --git a/services/repository/branch.go b/services/repository/branch.go index 09bfd86081..f33bac7621 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -152,8 +152,8 @@ func RenameBranch(repo *models.Repository, doer *user_model.User, gitRepo *git.R return "", err } - notification.NotifyDeleteRef(doer, repo, "branch", "refs/heads/"+from) - notification.NotifyCreateRef(doer, repo, "branch", "refs/heads/"+to) + notification.NotifyDeleteRef(doer, repo, "branch", git.BranchPrefix+from) + notification.NotifyCreateRef(doer, repo, "branch", git.BranchPrefix+to) return "", nil } diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 4b10ed0b77..55dcd7436c 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -266,7 +266,7 @@ func (t *TemporaryUploadRepository) Push(doer *user_model.User, commitHash strin env := models.PushingEnvironment(doer, t.repo) if err := git.Push(t.gitRepo.Ctx, t.basePath, git.PushOptions{ Remote: t.repo.RepoPath(), - Branch: strings.TrimSpace(commitHash) + ":refs/heads/" + strings.TrimSpace(branch), + Branch: strings.TrimSpace(commitHash) + ":" + git.BranchPrefix + strings.TrimSpace(branch), Env: env, }); err != nil { if git.IsErrPushOutOfDate(err) { |