Move SetDefaultBranch to gitrepo

lunny · lunny · commit 760749b6b75f · 2025-03-16T11:44:00.000-07:00
diff --git a/models/repo/repo.go b/models/repo/repo.go
@@ -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 == "" {
diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go
@@ -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))
diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go
@@ -19,6 +19,8 @@ import (
 type Repository interface {
 	GetName() string
 	GetOwnerName() string
+	GetDefaultBranch() string
+	GetDefaultWikiBranch() string
 }
 
 func absPath(owner, name string) string {
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -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 {
diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go
@@ -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),
 		})
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
@@ -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
 		}
diff --git a/services/repository/adopt.go b/services/repository/adopt.go
@@ -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)
 			}
 		}
@@ -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)
 		}
 	}
diff --git a/services/repository/branch.go b/services/repository/branch.go
@@ -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
 			}
@@ -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
 	}
diff --git a/services/repository/create.go b/services/repository/create.go
@@ -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)
 		}
 
diff --git a/services/repository/generate.go b/services/repository/generate.go
@@ -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 {
diff --git a/services/repository/push.go b/services/repository/push.go
@@ -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
 							}
 						}
diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ import (`
`19`	`19`	`type Repository interface {`
`20`	`20`	`GetName() string`
`21`	`21`	`GetOwnerName() string`
	`22`	`+ GetDefaultBranch() string`
	`23`	`+ GetDefaultWikiBranch() string`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`func absPath(owner, name string) string {`
Original file line number	Diff line number	Diff line change
`@@ -735,14 +735,14 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err`
`735`	`735`	`// Default branch only updated if changed and exist or the repository is empty`
`736`	`736`	`updateRepoLicense := false`
`737`	`737`	`if opts.DefaultBranch != nil && repo.DefaultBranch != opts.DefaultBranch && (repo.IsEmpty \|\| gitrepo.IsBranchExist(ctx, ctx.Repo.Repository, opts.DefaultBranch)) {`
	`738`	`+ repo.DefaultBranch = *opts.DefaultBranch`
`738`	`739`	`if !repo.IsEmpty {`
`739`		`- if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, *opts.DefaultBranch); err != nil {`
	`740`	`+ if err := gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`740`	`741`	`ctx.APIErrorInternal(err)`
`741`	`742`	`return err`
`742`	`743`	`}`
`743`	`744`	`updateRepoLicense = true`
`744`	`745`	`}`
`745`		`- repo.DefaultBranch = *opts.DefaultBranch`
`746`	`746`	`}`
`747`	`747`
`748`	`748`	`if err := repo_service.UpdateRepository(ctx, repo, visibilityChanged); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re`
`629`	`629`	`m.Repo.DefaultBranch = firstName`
`630`	`630`	`}`
`631`	`631`	`// Update the git repository default branch`
`632`		`- if err := gitrepo.SetDefaultBranch(ctx, m.Repo, m.Repo.DefaultBranch); err != nil {`
	`632`	`+ if err := gitrepo.SetDefaultBranchForRepo(ctx, m.Repo); err != nil {`
`633`	`633`	`log.Error("Failed to update default branch of underlying git repository %-v. Error: %v", m.Repo, err)`
`634`	`634`	`return false`
`635`	`635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,14 +124,14 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr`
`124`	`124`	`if len(defaultBranch) > 0 {`
`125`	`125`	`repo.DefaultBranch = defaultBranch`
`126`	`126`
`127`		`- if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
	`127`	`+ if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`128`	`128`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`129`	`129`	`}`
`130`	`130`	`} else {`
`131`	`131`	`repo.DefaultBranch, err = gitrepo.GetDefaultBranch(ctx, repo)`
`132`	`132`	`if err != nil {`
`133`	`133`	`repo.DefaultBranch = setting.Repository.DefaultBranch`
`134`		`- if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
	`134`	`+ if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`135`	`135`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -188,7 +188,7 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr`
`188`	`188`	`repo.DefaultBranch = setting.Repository.DefaultBranch`
`189`	`189`	`}`
`190`	`190`
`191`		`- if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
	`191`	`+ if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`192`	`192`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,8 @@ func RenameBranch(ctx context.Context, repo repo_model.Repository, doer user_m`
`463`	`463`	`log.Error("CancelPreviousJobs: %v", err)`
`464`	`464`	`}`
`465`	`465`
`466`		`- err2 = gitrepo.SetDefaultBranch(ctx, repo, to)`
	`466`	`+ // repo's default branch has been updated in git_model.RenameBranch`
	`467`	`+ err2 = gitrepo.SetDefaultBranchForRepo(ctx, repo)`
`467`	`468`	`if err2 != nil {`
`468`	`469`	`return err2`
`469`	`470`	`}`
`@@ -650,7 +651,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB`
`650`	`651`	`log.Error("CancelPreviousJobs: %v", err)`
`651`	`652`	`}`
`652`	`653`
`653`		`- return gitrepo.SetDefaultBranch(ctx, repo, newBranchName)`
	`654`	`+ return gitrepo.SetDefaultBranchForRepo(ctx, repo)`
`654`	`655`	`}); err != nil {`
`655`	`656`	`return err`
`656`	`657`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func initRepository(ctx context.Context, u user_model.User, repo repo_model.Re`
`181`	`181`
`182`	`182`	`if len(opts.DefaultBranch) > 0 {`
`183`	`183`	`repo.DefaultBranch = opts.DefaultBranch`
`184`		`- if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
	`184`	`+ if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`185`	`185`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`186`	`186`	`}`
`187`	`187`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r`
`281`	`281`	`repo.DefaultBranch = templateRepo.DefaultBranch`
`282`	`282`	`}`
`283`	`283`
`284`		`- if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
	`284`	`+ if err = gitrepo.SetDefaultBranchForRepo(ctx, repo); err != nil {`
`285`	`285`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`286`	`286`	`}`
`287`	`287`	`if err = UpdateRepository(ctx, repo, false); err != nil {`