diff --git a/src/test/scala/gitbucket/core/util/GitSpecUtil.scala b/src/test/scala/gitbucket/core/util/GitSpecUtil.scala index 2c9154d..11506c3 100644 --- a/src/test/scala/gitbucket/core/util/GitSpecUtil.scala +++ b/src/test/scala/gitbucket/core/util/GitSpecUtil.scala @@ -1,7 +1,5 @@ package gitbucket.core.util -import gitbucket.core.model._ -import gitbucket.core.util.Directory._ import gitbucket.core.util.ControlUtil._ import org.apache.commons.io.FileUtils @@ -14,14 +12,13 @@ import org.eclipse.jgit.errors._ import java.nio.file._ -import java.util.Date import java.io.File object GitSpecUtil { def withTestFolder[U](f: File => U): U = { val folder = new File(System.getProperty("java.io.tmpdir"), "test-" + System.nanoTime) if(!folder.mkdirs()){ - throw new java.io.IOException("can't create folder "+folder.getAbsolutePath) + throw new java.io.IOException("can't create folder " + folder.getAbsolutePath) } try { f(folder) @@ -56,7 +53,7 @@ JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), branch, autorName, autorEmail, message) inserter.flush() - inserter.release() + inserter.close() } def getFile(git: Git, branch: String, path: String) = { val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch)) @@ -99,7 +96,7 @@ val inserter = repository.newObjectInserter val mergeCommitId = inserter.insert(mergeCommit) inserter.flush() - inserter.release() + inserter.close() // update refs val refUpdate = repository.updateRef(into) refUpdate.setNewObjectId(mergeCommitId)