sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

pull/35951/head
Lunny Xiao 2025-12-10 10:52:15 +07:00
parent c6e32a267e
commit d849b52f15
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/repository/branch.go
Unescape Escape View File

@ -537,7 +537,7 @@ func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git
} }
// branch protection will be checked in the pre received hook, so that we don't need any check here // branch protection will be checked in the pre received hook, so that we don't need any check here
return gitrepo.Push(ctx, repo, pushOpts) return gitrepo.Push(ctx, repo, repo, pushOpts)
} }
var ErrBranchIsDefault = util.ErrorWrap(util.ErrPermissionDenied, "branch is default") var ErrBranchIsDefault = util.ErrorWrap(util.ErrPermissionDenied, "branch is default")