From 6ec1aac9ad75c801760920c275364793b346a0c5 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 15 May 2019 13:04:16 +0200
Subject: [PATCH] fix(platform): always set baseBranch
---
lib/platform/azure/index.js | 16 +++++++---------
lib/platform/bitbucket/index.js | 16 +++++++---------
lib/platform/github/index.js | 14 ++++++--------
lib/platform/gitlab/index.js | 10 ++++------
4 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/lib/platform/azure/index.js b/lib/platform/azure/index.js
index faf580239e..d3ea47deba 100644
--- a/lib/platform/azure/index.js
+++ b/lib/platform/azure/index.js
@@ -153,15 +153,13 @@ function getRepoForceRebase() {
}
// istanbul ignore next
-async function setBaseBranch(branchName) {
- if (branchName) {
- logger.debug(`Setting baseBranch to ${branchName}`);
- config.baseBranch = branchName;
- delete config.baseCommitSHA;
- delete config.fileList;
- await config.storage.setBaseBranch(branchName);
- await getFileList(branchName);
- }
+async function setBaseBranch(branchName = config.baseBranch) {
+ logger.debug(`Setting baseBranch to ${branchName}`);
+ config.baseBranch = branchName;
+ delete config.baseCommitSHA;
+ delete config.fileList;
+ await config.storage.setBaseBranch(branchName);
+ await getFileList(branchName);
}
// Search
diff --git a/lib/platform/bitbucket/index.js b/lib/platform/bitbucket/index.js
index ce23b84ff0..5ddca04660 100644
--- a/lib/platform/bitbucket/index.js
+++ b/lib/platform/bitbucket/index.js
@@ -140,15 +140,13 @@ function getRepoForceRebase() {
return false;
}
-async function setBaseBranch(branchName) {
- if (branchName) {
- logger.debug(`Setting baseBranch to ${branchName}`);
- config.baseBranch = branchName;
- delete config.baseCommitSHA;
- delete config.fileList;
- config.storage.setBaseBranch(branchName);
- await getFileList(branchName);
- }
+async function setBaseBranch(branchName = config.baseBranch) {
+ logger.debug(`Setting baseBranch to ${branchName}`);
+ config.baseBranch = branchName;
+ delete config.baseCommitSHA;
+ delete config.fileList;
+ await config.storage.setBaseBranch(branchName);
+ await getFileList(branchName);
}
// Search
diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js
index dcf61511fd..e8f20ad278 100644
--- a/lib/platform/github/index.js
+++ b/lib/platform/github/index.js
@@ -376,14 +376,12 @@ async function getBranchProtection(branchName) {
return res.body;
}
-async function setBaseBranch(branchName) {
- if (branchName) {
- logger.debug(`Setting baseBranch to ${branchName}`);
- config.baseBranch = branchName;
- config.baseCommitSHA = null;
- config.storage.setBaseBranch(branchName);
- await getFileList(branchName);
- }
+async function setBaseBranch(branchName = config.baseBranch) {
+ logger.debug(`Setting baseBranch to ${branchName}`);
+ config.baseBranch = branchName;
+ config.baseCommitSHA = null;
+ await config.storage.setBaseBranch(branchName);
+ await getFileList(branchName);
}
// Search
diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js
index f08ba719ea..842abde7d8 100644
--- a/lib/platform/gitlab/index.js
+++ b/lib/platform/gitlab/index.js
@@ -164,12 +164,10 @@ function getRepoForceRebase() {
return false;
}
-async function setBaseBranch(branchName) {
- if (branchName) {
- logger.debug(`Setting baseBranch to ${branchName}`);
- config.baseBranch = branchName;
- await config.storage.setBaseBranch(branchName);
- }
+async function setBaseBranch(branchName = config.baseBranch) {
+ logger.debug(`Setting baseBranch to ${branchName}`);
+ config.baseBranch = branchName;
+ await config.storage.setBaseBranch(branchName);
}
// Search
--
GitLab