Fix incorrect default branch when adopt a repository (#30912) (#30928)

Backport #30912

ps: removed useless `u *user_model.User` for `adoptRepository`

diff --git a/services/repository/adopt.go b/services/repository/adopt.go
index 1ad1ef5b2cf01429d6af7499445f3c4ba16cdc33..3d6fe71a091910bab1827bf653ff993b8bc62c91 100644 (file)
--- a/services/repository/adopt.go
+++ b/services/repository/adopt.go
@@ -36,10 +36,6 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
                }
        }
 
-       if len(opts.DefaultBranch) == 0 {
-               opts.DefaultBranch = setting.Repository.DefaultBranch
-       }
-
        repo := &repo_model.Repository{
                OwnerID:                         u.ID,
                Owner:                           u,
@@ -80,8 +76,8 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
                        return fmt.Errorf("getRepositoryByID: %w", err)
                }
 
-               if err := adoptRepository(ctx, repoPath, doer, repo, opts.DefaultBranch); err != nil {
-                       return fmt.Errorf("createDelegateHooks: %w", err)
+               if err := adoptRepository(ctx, repoPath, repo, opts.DefaultBranch); err != nil {
+                       return fmt.Errorf("adoptRepository: %w", err)
                }
 
                if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil {
@@ -111,7 +107,7 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
        return repo, nil
 }
 
-func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, repo *repo_model.Repository, defaultBranch string) (err error) {
+func adoptRepository(ctx context.Context, repoPath string, repo *repo_model.Repository, defaultBranch string) (err error) {
        isExist, err := util.IsExist(repoPath)
        if err != nil {
                log.Error("Unable to check if %s exists. Error: %v", repoPath, err)
@@ -143,6 +139,21 @@ func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, r
                }
        }
 
+       // Don't bother looking this repo in the context it won't be there
+       gitRepo, err := gitrepo.OpenRepository(ctx, repo)
+       if err != nil {
+               return fmt.Errorf("openRepository: %w", err)
+       }
+       defer gitRepo.Close()
+
+       if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, repo, gitRepo, 0); err != nil {
+               return fmt.Errorf("SyncRepoBranchesWithRepo: %w", err)
+       }
+
+       if err = repo_module.SyncReleasesWithTags(ctx, repo, gitRepo); err != nil {
+               return fmt.Errorf("SyncReleasesWithTags: %w", err)
+       }
+
        branches, _ := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
                RepoID:          repo.ID,
                ListOptions:     db.ListOptionsAll,
@@ -183,26 +194,10 @@ func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, r
                        return fmt.Errorf("setDefaultBranch: %w", err)
                }
        }
-
        if err = repo_module.UpdateRepository(ctx, repo, false); err != nil {
                return fmt.Errorf("updateRepository: %w", err)
        }
 
-       // Don't bother looking this repo in the context it won't be there
-       gitRepo, err := gitrepo.OpenRepository(ctx, repo)
-       if err != nil {
-               return fmt.Errorf("openRepository: %w", err)
-       }
-       defer gitRepo.Close()
-
-       if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, repo, gitRepo, 0); err != nil {
-               return fmt.Errorf("SyncRepoBranches: %w", err)
-       }
-
-       if err = repo_module.SyncReleasesWithTags(ctx, repo, gitRepo); err != nil {
-               return fmt.Errorf("SyncReleasesWithTags: %w", err)
-       }
-
        return nil
 }