Skip to content

Use gitrepo.SetDefaultBranch when set default branch of wiki repository #33911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+3 −3
Open

Use gitrepo.SetDefaultBranch when set default branch of wiki repository #33911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
760749b
Move SetDefaultBranch to gitrepo
lunny Mar 16, 2025
f9f8288
Merge branch 'main' into lunny/reafctor_setdefaultbranch
lunny Mar 19, 2025
2b4bddf
Merge branch 'main' into lunny/reafctor_setdefaultbranch
lunny Mar 27, 2025
eda6351
Revert interface change
lunny Mar 29, 2025
95e2224
Merge branch 'main' into lunny/reafctor_setdefaultbranch
lunny Mar 29, 2025
00a9044
Revert unnecessary changes
lunny Mar 29, 2025
49ba333
Merge branch 'main' into lunny/reafctor_setdefaultbranch
lunny Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions models/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,14 @@ func (repo *Repository) GetOwnerName() string {
return repo.OwnerName
}

func (repo *Repository) GetDefaultBranch() string {
return repo.DefaultBranch
}

func (repo *Repository) GetDefaultWikiBranch() string {
return repo.DefaultWikiBranch
}

// SanitizedOriginalURL returns a sanitized OriginalURL
func (repo *Repository) SanitizedOriginalURL() string {
if repo.OriginalURL == "" {
Expand Down
13 changes: 10 additions & 3 deletions modules/gitrepo/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,21 @@ func GetBranchCommitID(ctx context.Context, repo Repository, branch string) (str
return gitRepo.GetBranchCommitID(branch)
}

// SetDefaultBranch sets default branch of repository.
func SetDefaultBranch(ctx context.Context, repo Repository, name string) error {
// SetDefaultBranchForRepo sets default branch of repository.
func SetDefaultBranchForRepo(ctx context.Context, repo Repository) error {
_, _, err := git.NewCommand("symbolic-ref", "HEAD").
AddDynamicArguments(git.BranchPrefix+name).
AddDynamicArguments(git.BranchPrefix+repo.GetDefaultBranch()).
RunStdString(ctx, &git.RunOpts{Dir: repoPath(repo)})
return err
}

func SetDefaultBranchForWiki(ctx context.Context, repo Repository) error {
_, _, err := git.NewCommand("symbolic-ref", "HEAD").
AddDynamicArguments(git.BranchPrefix+repo.GetDefaultWikiBranch()).
RunStdString(ctx, &git.RunOpts{Dir: wikiPath(repo)})
return err
}

// GetDefaultBranch gets default branch of repository.
func GetDefaultBranch(ctx context.Context, repo Repository) (string, error) {
return git.GetDefaultBranch(ctx, repoPath(repo))
Expand Down
2 changes: 2 additions & 0 deletions modules/gitrepo/gitrepo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
type Repository interface {
GetName() string
GetOwnerName() string
GetDefaultBranch() string
GetDefaultWikiBranch() string
}

func absPath(owner, name string) string {
Expand Down
4 changes: 2 additions & 2 deletions routers/api/v1/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,14 +735,14 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
// Default branch only updated if changed and exist or the repository is empty
updateRepoLicense := false
if opts.DefaultBranch != nil && repo.DefaultBranch != *opts.DefaultBranch && (repo.IsEmpty || gitrepo.IsBranchExist(ctx, ctx.Repo.Repository, *opts.DefaultBranch)) {
repo.DefaultBranch = *opts.DefaultBranch
if !repo.IsEmpty {
if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, *opts.DefaultBranch); err != nil {
if err := gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
ctx.APIErrorInternal(err)
return err
}
updateRepoLicense = true
}
repo.DefaultBranch = *opts.DefaultBranch
}

if err := repo_service.UpdateRepository(ctx, repo, visibilityChanged); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion routers/private/default_branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) {
branch := ctx.PathParam("branch")

ctx.Repo.Repository.DefaultBranch = branch
if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, ctx.Repo.Repository.DefaultBranch); err != nil {
if err := gitrepo.SetDefaultBranchForRepo(ctx, ctx.Repo.Repository); err != nil {
ctx.JSON(http.StatusInternalServerError, private.Response{
Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err),
})
Expand Down
2 changes: 1 addition & 1 deletion services/mirror/mirror_pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re
m.Repo.DefaultBranch = firstName
}
// Update the git repository default branch
if err := gitrepo.SetDefaultBranch(ctx, m.Repo, m.Repo.DefaultBranch); err != nil {
if err := gitrepo.SetDefaultBranchForRepo(ctx, m.Repo); err != nil {
log.Error("Failed to update default branch of underlying git repository %-v. Error: %v", m.Repo, err)
return false
}
Expand Down
6 changes: 3 additions & 3 deletions services/repository/adopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
if len(defaultBranch) > 0 {
repo.DefaultBranch = defaultBranch

if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
} else {
repo.DefaultBranch, err = gitrepo.GetDefaultBranch(ctx, repo)
if err != nil {
repo.DefaultBranch = setting.Repository.DefaultBranch
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
}
Expand Down Expand Up @@ -188,7 +188,7 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
repo.DefaultBranch = setting.Repository.DefaultBranch
}

if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
}
Expand Down
5 changes: 3 additions & 2 deletions services/repository/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,8 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
log.Error("CancelPreviousJobs: %v", err)
}

err2 = gitrepo.SetDefaultBranch(ctx, repo, to)
// repo's default branch has been updated in git_model.RenameBranch
err2 = gitrepo.SetDefaultBranchForRepo(ctx, repo)
if err2 != nil {
return err2
}
Expand Down Expand Up @@ -650,7 +651,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB
log.Error("CancelPreviousJobs: %v", err)
}

return gitrepo.SetDefaultBranch(ctx, repo, newBranchName)
return gitrepo.SetDefaultBranchForRepo(ctx, repo)
}); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion services/repository/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func initRepository(ctx context.Context, u *user_model.User, repo *repo_model.Re

if len(opts.DefaultBranch) > 0 {
repo.DefaultBranch = opts.DefaultBranch
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}

Expand Down
2 changes: 1 addition & 1 deletion services/repository/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r
repo.DefaultBranch = templateRepo.DefaultBranch
}

if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
if err = UpdateRepository(ctx, repo, false); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion services/repository/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
repo.DefaultBranch = refName
repo.IsEmpty = false
if repo.DefaultBranch != setting.Repository.DefaultBranch {
if err := gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
if err := gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion services/wiki/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error {
return fmt.Errorf("InitRepository: %w", err)
} else if err = gitrepo.CreateDelegateHooksForWiki(ctx, repo); err != nil {
return fmt.Errorf("createDelegateHooks: %w", err)
} else if _, _, err = git.NewCommand("symbolic-ref", "HEAD").AddDynamicArguments(git.BranchPrefix+repo.DefaultWikiBranch).RunStdString(ctx, &git.RunOpts{Dir: repo.WikiPath()}); err != nil {
} else if err = gitrepo.SetDefaultBranchForWiki(ctx, repo); err != nil {
return fmt.Errorf("unable to set default wiki branch to %q: %w", repo.DefaultWikiBranch, err)
}
return nil
Expand Down