Commit fb056bf

authored

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

1 parent 7636d58 commit fb056bfCopy full SHA for fb056bf

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -736,14 +736,14 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err`
`736`	`736`	`// Default branch only updated if changed and exist or the repository is empty`
`737`	`737`	`updateRepoLicense := false`
`738`	`738`	`if opts.DefaultBranch != nil && repo.DefaultBranch != opts.DefaultBranch && (repo.IsEmpty \|\| gitrepo.IsBranchExist(ctx, ctx.Repo.Repository, opts.DefaultBranch)) {`
	`739`	`+ repo.DefaultBranch = *opts.DefaultBranch`
`739`	`740`	`if !repo.IsEmpty {`
`740`		`- if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, *opts.DefaultBranch); err != nil {`
	`741`	`+ if err := gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
`741`	`742`	`ctx.APIErrorInternal(err)`
`742`	`743`	`return err`
`743`	`744`	`}`
`744`	`745`	`updateRepoLicense = true`
`745`	`746`	`}`
`746`		`- repo.DefaultBranch = *opts.DefaultBranch`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`if err := repo_service.UpdateRepository(ctx, repo, visibilityChanged); err != nil {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error {`
`43`	`43`	`return fmt.Errorf("InitRepository: %w", err)`
`44`	`44`	`} else if err = gitrepo.CreateDelegateHooks(ctx, repo.WikiStorageRepo()); err != nil {`
`45`	`45`	`return fmt.Errorf("createDelegateHooks: %w", err)`
`46`		`- } else if _, _, err = git.NewCommand("symbolic-ref", "HEAD").AddDynamicArguments(git.BranchPrefix+repo.DefaultWikiBranch).RunStdString(ctx, &git.RunOpts{Dir: repo.WikiPath()}); err != nil {`
	`46`	`+ } else if err = gitrepo.SetDefaultBranch(ctx, repo.WikiStorageRepo(), repo.DefaultWikiBranch); err != nil {`
`47`	`47`	`return fmt.Errorf("unable to set default wiki branch to %q: %w", repo.DefaultWikiBranch, err)`
`48`	`48`	`}`
`49`	`49`	`return nil`

Comments

(0)