From 2cc1336e82e9b75811886b2e98b0518508be4480 Mon Sep 17 00:00:00 2001
From: onukura <y.bibos.ishikawa@gmail.com>
Date: Tue, 18 Aug 2020 20:56:54 +0900
Subject: [PATCH] Keep the default branch in the forked repositories (#2514)

---
 .../gitbucket/core/service/RepositoryCreationService.scala     | 2 ++
 src/main/scala/gitbucket/core/service/RepositoryService.scala  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
index c72e85b20..2e220d528 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -180,12 +180,14 @@ trait RepositoryCreationService {
         Database() withTransaction { implicit session =>
           val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
           val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+          val originDefaultBranchName = repository.repository.defaultBranch
 
           insertRepository(
             repositoryName = repository.name,
             userName = accountName,
             description = repository.repository.description,
             isPrivate = repository.repository.isPrivate,
+            defaultBranch = originDefaultBranchName,
             originRepositoryName = Some(originRepositoryName),
             originUserName = Some(originUserName),
             parentRepositoryName = Some(repository.name),
diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala
index 0e18f9511..c5348b162 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -34,6 +34,7 @@ trait RepositoryService {
     userName: String,
     description: Option[String],
     isPrivate: Boolean,
+    defaultBranch: String = "master",
     originRepositoryName: Option[String] = None,
     originUserName: Option[String] = None,
     parentRepositoryName: Option[String] = None,
@@ -45,7 +46,7 @@ trait RepositoryService {
         repositoryName = repositoryName,
         isPrivate = isPrivate,
         description = description,
-        defaultBranch = "master",
+        defaultBranch = defaultBranch,
         registeredDate = currentDate,
         updatedDate = currentDate,
         lastActivityDate = currentDate,