From 00a9044f41be6c7f555446c953d79ea2e435f30c Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 28 Mar 2025 19:13:07 -0700
Subject: [PATCH] Revert unnecessary changes

---
 modules/gitrepo/branch.go         | 4 ++--
 routers/private/default_branch.go | 2 +-
 services/repository/branch.go     | 5 ++---
 services/repository/transfer.go   | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go
index 7643787b91..25ea5abfca 100644
--- a/modules/gitrepo/branch.go
+++ b/modules/gitrepo/branch.go
@@ -32,9 +32,9 @@ func GetBranchCommitID(ctx context.Context, repo Repository, branch string) (str
 }
 
 // SetDefaultBranch sets default branch of repository.
-func SetDefaultBranch(ctx context.Context, repo Repository, defaultBranch string) error {
+func SetDefaultBranch(ctx context.Context, repo Repository, name string) error {
 	_, _, err := git.NewCommand("symbolic-ref", "HEAD").
-		AddDynamicArguments(git.BranchPrefix+defaultBranch).
+		AddDynamicArguments(git.BranchPrefix+name).
 		RunStdString(ctx, &git.RunOpts{Dir: repoPath(repo)})
 	return err
 }
diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go
index 27311c900f..c375d70dc6 100644
--- 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, branch); err != nil {
+	if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, ctx.Repo.Repository.DefaultBranch); 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/repository/branch.go b/services/repository/branch.go
index 8b9f4dc290..8804778bd5 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -463,8 +463,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
 				log.Error("CancelPreviousJobs: %v", err)
 			}
 
-			// repo's default branch has been updated in git_model.RenameBranch
-			err2 = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch)
+			err2 = gitrepo.SetDefaultBranch(ctx, repo, to)
 			if err2 != nil {
 				return err2
 			}
@@ -651,7 +650,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB
 			log.Error("CancelPreviousJobs: %v", err)
 		}
 
-		return gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch)
+		return gitrepo.SetDefaultBranch(ctx, repo, newBranchName)
 	}); err != nil {
 		return err
 	}
diff --git a/services/repository/transfer.go b/services/repository/transfer.go
index b63dd97a9b..a589bc469d 100644
--- a/services/repository/transfer.go
+++ b/services/repository/transfer.go
@@ -337,8 +337,7 @@ func changeRepositoryName(ctx context.Context, repo *repo_model.Repository, newR
 	}
 
 	if err = gitrepo.RenameRepository(ctx, repo,
-		repo_model.StorageRepo(repo_model.RelativePath(repo.OwnerName, newRepoName)),
-	); err != nil {
+		repo_model.StorageRepo(repo_model.RelativePath(repo.OwnerName, newRepoName))); err != nil {
 		return fmt.Errorf("rename repository directory: %w", err)
 	}