From d7af5551ebbc37e1885384852bef56a8deeb9126 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Mon, 5 Aug 2013 00:53:30 +0900
Subject: [PATCH] (refs #2)Fix temporary branch name.

---
 src/main/scala/app/PullRequestsController.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index a6861b309..467573f30 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -103,15 +103,17 @@ trait PullRequestsControllerBase extends ControllerBase {
           recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
 
           // fetch pull request to working repository
+          val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
+
           git.fetch
             .setRemote(getRepositoryDir(repository.owner, repository.name).toURI.toString)
-            .setRefSpecs(new RefSpec(s"refs/pull/${issueId}/head:refs/heads/gitbucket-merge-${issueId}")).call
+            .setRefSpecs(new RefSpec(s"refs/pull/${issueId}/head:refs/heads/${pullRequestBranchName}")).call
 
           // merge pull request
           git.checkout.setName(pullreq.branch).call
 
           val result = git.merge
-            .include(git.getRepository.resolve(s"gitbucket-merge-${issueId}"))
+            .include(git.getRepository.resolve(pullRequestBranchName))
             .setFastForward(FastForwardMode.NO_FF)
             .setCommit(false)
             .call