On Migration respect old DefaultBranch (#12843)

* On Migration respect old DefaultBranch

* add DefaultBranch int test set

Co-authored-by: zeripath <art27@cantab.net>

modules/migrations/base/repo.go

@@ -7,13 +7,14 @@ package base
 
 // Repository defines a standard repository information
 type Repository struct {
-	Name         string
+	Name          string
-	Owner        string
+	Owner         string
-	IsPrivate    bool
+	IsPrivate     bool
-	IsMirror     bool
+	IsMirror      bool
-	Description  string
+	Description   string
-	AuthUsername string
+	AuthUsername  string
-	AuthPassword string
+	AuthPassword  string
-	CloneURL     string
+	CloneURL      string
-	OriginalURL  string
+	OriginalURL   string
+	DefaultBranch string
 }

modules/migrations/gitea.go

@@ -122,6 +122,7 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate
 	if err != nil {
 		return err
 	}
+	r.DefaultBranch = repo.DefaultBranch
 
 	r, err = repository.MigrateRepositoryGitData(g.doer, owner, r, base.MigrateOptions{
 		RepoName:       g.repoName,

modules/migrations/github.go

@@ -143,14 +143,20 @@ func (g *GithubDownloaderV3) GetRepoInfo() (*base.Repository, error) {
 	}
 	g.rate = &resp.Rate
 
+	defaultBranch := ""
+	if gr.DefaultBranch != nil {
+		defaultBranch = *gr.DefaultBranch
+	}
+
 	// convert github repo to stand Repo
 	return &base.Repository{
-		Owner:       g.repoOwner,
+		Owner:         g.repoOwner,
-		Name:        gr.GetName(),
+		Name:          gr.GetName(),
-		IsPrivate:   *gr.Private,
+		IsPrivate:     *gr.Private,
-		Description: gr.GetDescription(),
+		Description:   gr.GetDescription(),
-		OriginalURL: gr.GetHTMLURL(),
+		OriginalURL:   gr.GetHTMLURL(),
-		CloneURL:    gr.GetCloneURL(),
+		CloneURL:      gr.GetCloneURL(),
+		DefaultBranch: defaultBranch,
 	}, nil
 }
 

modules/migrations/github_test.go

@@ -72,11 +72,12 @@ func TestGitHubDownloadRepo(t *testing.T) {
 	repo, err := downloader.GetRepoInfo()
 	assert.NoError(t, err)
 	assert.EqualValues(t, &base.Repository{
-		Name:        "test_repo",
+		Name:          "test_repo",
-		Owner:       "go-gitea",
+		Owner:         "go-gitea",
-		Description: "Test repository for testing migration from github to gitea",
+		Description:   "Test repository for testing migration from github to gitea",
-		CloneURL:    "https://github.com/go-gitea/test_repo.git",
+		CloneURL:      "https://github.com/go-gitea/test_repo.git",
-		OriginalURL: "https://github.com/go-gitea/test_repo",
+		OriginalURL:   "https://github.com/go-gitea/test_repo",
+		DefaultBranch: "master",
 	}, repo)
 
 	topics, err := downloader.GetTopics()

modules/migrations/gitlab.go

@@ -139,12 +139,13 @@ func (g *GitlabDownloader) GetRepoInfo() (*base.Repository, error) {
 
 	// convert gitlab repo to stand Repo
 	return &base.Repository{
-		Owner:       owner,
+		Owner:         owner,
-		Name:        gr.Name,
+		Name:          gr.Name,
-		IsPrivate:   private,
+		IsPrivate:     private,
-		Description: gr.Description,
+		Description:   gr.Description,
-		OriginalURL: gr.WebURL,
+		OriginalURL:   gr.WebURL,
-		CloneURL:    gr.HTTPURLToRepo,
+		CloneURL:      gr.HTTPURLToRepo,
+		DefaultBranch: gr.DefaultBranch,
 	}, nil
 }
 

modules/migrations/gitlab_test.go

@@ -37,11 +37,12 @@ func TestGitlabDownloadRepo(t *testing.T) {
 	assert.NoError(t, err)
 	// Repo Owner is blank in Gitlab Group repos
 	assert.EqualValues(t, &base.Repository{
-		Name:        "test_repo",
+		Name:          "test_repo",
-		Owner:       "",
+		Owner:         "",
-		Description: "Test repository for testing migration from gitlab to gitea",
+		Description:   "Test repository for testing migration from gitlab to gitea",
-		CloneURL:    "https://gitlab.com/gitea/test_repo.git",
+		CloneURL:      "https://gitlab.com/gitea/test_repo.git",
-		OriginalURL: "https://gitlab.com/gitea/test_repo",
+		OriginalURL:   "https://gitlab.com/gitea/test_repo",
+		DefaultBranch: "master",
 	}, repo)
 
 	topics, err := downloader.GetTopics()

modules/repository/repo.go

@@ -102,18 +102,22 @@ func MigrateRepositoryGitData(doer, u *models.User, repo *models.Repository, opt
 		return repo, fmt.Errorf("git.IsEmpty: %v", err)
 	}
 
-	if !opts.Releases && !repo.IsEmpty {
+	if !repo.IsEmpty {
-		// Try to get HEAD branch and set it as default branch.
+		if len(repo.DefaultBranch) == 0 {
-		headBranch, err := gitRepo.GetHEADBranch()
+			// Try to get HEAD branch and set it as default branch.
-		if err != nil {
+			headBranch, err := gitRepo.GetHEADBranch()
-			return repo, fmt.Errorf("GetHEADBranch: %v", err)
+			if err != nil {
-		}
+				return repo, fmt.Errorf("GetHEADBranch: %v", err)
-		if headBranch != nil {
+			}
-			repo.DefaultBranch = headBranch.Name
+			if headBranch != nil {
+				repo.DefaultBranch = headBranch.Name
+			}
 		}
 
-		if err = SyncReleasesWithTags(repo, gitRepo); err != nil {
+		if !opts.Releases {
-			log.Error("Failed to synchronize tags to releases for repository: %v", err)
+			if err = SyncReleasesWithTags(repo, gitRepo); err != nil {
+				log.Error("Failed to synchronize tags to releases for repository: %v", err)
+			}
 		}
 	}