From e5f19d0fb64ef1d6b05baa4b3515811a8d8c4620 Mon Sep 17 00:00:00 2001
From: Abheek Dhawan <abheekd@protonmail.com>
Date: Sat, 19 Mar 2022 23:05:58 -0500
Subject: [PATCH] Use specified default branch if it exists while generating
 git commits

---
 modules/repository/generate.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/repository/generate.go b/modules/repository/generate.go
index 3a991a2403db1..cf219f4c26b73 100644
--- a/modules/repository/generate.go
+++ b/modules/repository/generate.go
@@ -184,7 +184,13 @@ func generateRepoCommit(ctx context.Context, repo, templateRepo, generateRepo *r
 		return fmt.Errorf("git remote add: %v", err)
 	}
 
-	return initRepoCommit(ctx, tmpDir, repo, repo.Owner, templateRepo.DefaultBranch)
+	// set default branch based on whether it's specified in the newly generated repo or not
+	defaultBranch := repo.DefaultBranch
+	if strings.TrimSpace(defaultBranch) == "" {
+		defaultBranch = templateRepo.DefaultBranch
+	}
+
+	return initRepoCommit(ctx, tmpDir, repo, repo.Owner, defaultBranch)
 }
 
 func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *repo_model.Repository) (err error) {