Bugfix

2025-11-02 11:36:05 +01:00 · 2013-07-26 18:29:00 +09:00
parent 4bd4c3e833
commit 59d85531ce
1 changed files with 4 additions and 3 deletions
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -140,11 +140,12 @@ trait PullRequestsControllerBase extends ControllerBase {
    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