luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-25 11:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Move get/set default branch from git package to gitrepo package to hide repopath (#29126)

Browse source 
(cherry picked from commit 25b842df261452a29570ba89ffc3a4842d73f68c)

Conflicts:
	routers/web/repo/wiki.go
	services/repository/branch.go
	services/repository/migrate.go
	services/wiki/wiki.go
	also apply to Forgejo specific usage of the refactored functions
This commit is contained in:
Lunny Xiao 2024-03-08 15:30:10 +08:00 • committed by Earl Warren
parent 6cb9e8d869
commit 3d9afe8813
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
16 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
services/wiki/wiki.go
View file

@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/log"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/sync"
@ -87,7 +88,7 @@ func NormalizeWikiBranch(ctx context.Context, repo *repo_model.Repository, to st
return err
}
if err := gitRepo.SetDefaultBranch(to); err != nil {
if err := gitrepo.SetDefaultBranch(ctx, repo, to); err != nil {
return err
}