diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 6e8df91..2503b76 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -140,11 +140,12 @@ LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){ val remote = getRepositoryDir(userName, repositoryName) val tmpdir = new java.io.File(getTemporaryDir(userName, repositoryName), "merge-check") + if(tmpdir.exists()){ + FileUtils.deleteDirectory(tmpdir) + } + val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).call try { - if(tmpdir.exists()){ - FileUtils.deleteDirectory(tmpdir) - } git.checkout.setName(branch).call git.fetch