Merge pull request #23 from twbs/try-fix-22

Also delete remote refs before pulling, to prevent conflicts

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala b/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
index 030736e..5f07fdf 100644
--- a/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
+++ b/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
@@ -21,6 +21,7 @@ class PullRequestPusher(
   }
 
   def pull(originRepo: RepositoryId): Boolean = {
+    deleteAllRemoteRefs()
     // clobberingly fetch all branch heads into a dummy remote
     SimpleSubprocess(Seq("git", "fetch", "--no-tags", "--recurse-submodules=no", originRepo.asPullRemote, "+refs/heads/*:refs/remotes/scratch/*")).run() match {
       case SuccessfulExit(_) => {
@@ -49,10 +50,13 @@ class PullRequestPusher(
         false
       }
     }
-    // delete all remote refs
+    deleteAllRemoteRefs()
+    success
+  }
+
+  private def deleteAllRemoteRefs() {
     implicit val logger = log
     gitRemoteRefsDirectory.deleteRecursively()
-    success
   }
 
   private def scheduleFailsafeBranchDeletion(branch: SavageBranch) {