Use specified default branch if it exists while generating git commits

abheekda1 · abheekda1 · commit e5f19d0fb64e · 2022-03-20T01:01:25.000-05:00
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,13 @@ func generateRepoCommit(ctx context.Context, repo, templateRepo, generateRepo *r`
`184`	`184`	`return fmt.Errorf("git remote add: %v", err)`
`185`	`185`	`}`
`186`	`186`
`187`		`- return initRepoCommit(ctx, tmpDir, repo, repo.Owner, templateRepo.DefaultBranch)`
	`187`	`+ // set default branch based on whether it's specified in the newly generated repo or not`
	`188`	`+ defaultBranch := repo.DefaultBranch`
	`189`	`+ if strings.TrimSpace(defaultBranch) == "" {`
	`190`	`+ defaultBranch = templateRepo.DefaultBranch`
	`191`	`+ }`
	`192`	`+`
	`193`	`+ return initRepoCommit(ctx, tmpDir, repo, repo.Owner, defaultBranch)`
`188`	`194`	`}`
`189`	`195`
`190`	`196`	`func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *repo_model.Repository) (err error) {`