SetDefaultBranch on pushing to empty repository (#7610)

go-gitea · Jul 30, 2019 · 4d643a5 · 4d643a5
1 parent a957d4e
commit 4d643a5
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/models/action.go b/models/action.go
@@ -685,6 +685,17 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 	if repo.IsEmpty && opts.NewCommitID != git.EmptySHA && strings.HasPrefix(opts.RefFullName, git.BranchPrefix) {
 		repo.DefaultBranch = refName
 		repo.IsEmpty = false
+		if refName != "master" {
+			gitRepo, err := git.OpenRepository(repo.RepoPath())
+			if err != nil {
+				return err
+			}
+			if err := gitRepo.SetDefaultBranch(repo.DefaultBranch); err != nil {
+				if !git.IsErrUnsupportedVersion(err) {
+					return err
+				}
+			}
+		}
 	}
 
 	// Change repository empty status and update last updated time.