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/repository | |
| 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/repository')
| -rw-r--r-- | services/repository/branch.go | 4 | ||||
| -rw-r--r-- | services/repository/files/temp_repo.go | 2 |
2 files changed, 3 insertions, 3 deletions
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) { |