Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 11:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Fix temporary branch name.

Browse Source
This commit is contained in:
takezoe
2013-08-05 00:53:30 +09:00
parent 1d03a82be4
commit d7af5551eb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/PullRequestsController.scala
View File

@@ -103,15 +103,17 @@ trait PullRequestsControllerBase extends ControllerBase {
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message) recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
// fetch pull request to working repository // fetch pull request to working repository
val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
git.fetch git.fetch
.setRemote(getRepositoryDir(repository.owner, repository.name).toURI.toString) .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 // merge pull request
git.checkout.setName(pullreq.branch).call git.checkout.setName(pullreq.branch).call
val result = git.merge val result = git.merge
.include(git.getRepository.resolve(s"gitbucket-merge-${issueId}")) .include(git.getRepository.resolve(pullRequestBranchName))
.setFastForward(FastForwardMode.NO_FF) .setFastForward(FastForwardMode.NO_FF)
.setCommit(false) .setCommit(false)
.call .call