From 3793a51e3fbf10c949126006b8882d8dba4f1b44 Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Sun, 28 Jan 2018 18:59:39 +0900 Subject: [PATCH] Add new initialize option as `git commit -m "..." --allow-empty"` --- .../service/RepositoryCreationService.scala | 27 ++++++++++--------- .../gitbucket/core/account/newrepo.scala.html | 7 +++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala index 7b9bffd79..88a777d3e 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala @@ -89,23 +89,26 @@ trait RepositoryCreationService { val gitdir = getRepositoryDir(owner, name) JGitUtil.initRepository(gitdir) - if (initOption == "README") { + if (initOption == "README" || initOption == "EMPTY_COMMIT") { using(Git.open(gitdir)) { git => val builder = DirCache.newInCore.builder() val inserter = git.getRepository.newObjectInserter() val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}") - val content = if (description.nonEmpty) { - name + "\n" + - "===============\n" + - "\n" + - description.get - } else { - name + "\n" + - "===============\n" - } - builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE, - inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8")))) + if (initOption == "README") { + val content = if (description.nonEmpty) { + name + "\n" + + "===============\n" + + "\n" + + description.get + } else { + name + "\n" + + "===============\n" + } + + builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE, + inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8")))) + } builder.finish() JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html index 32ae64520..05d204b9c 100644 --- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html +++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html @@ -65,6 +65,13 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C Create an empty repository. You have to initialize by yourself initially. +