Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/savage.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@rebertia.com>2015-04-25 20:58:18 +0300
committerChris Rebert <code@rebertia.com>2015-04-25 20:58:18 +0300
commitd12c55fcf83d4e5b55631315efa9dd45560e60df (patch)
treebcb240eb4c1607d134df8eb8c44c3c76e6749b1b
parent26affded344da93ba4551503adcf17d55b652112 (diff)
Fix #16
-rw-r--r--src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala b/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
index 3b58405..ad76a97 100644
--- a/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
+++ b/src/main/scala/com/getbootstrap/savage/server/PullRequestPusher.scala
@@ -33,7 +33,7 @@ class PullRequestPusher extends GitHubActorWithLogging {
def push(originRepo: RepositoryId, prNum: PullRequestNumber, commitSha: CommitSha): Boolean = {
val newBranch = {
- val branchName = settings.BranchPrefix + prNum.number
+ val branchName = s"${settings.BranchPrefix}${prNum.number}-${commitSha.sha}"
Branch(branchName).getOrElse {
throw new SecurityException(s"Generated insecure branch name: ${branchName}")
}