From a07fb52ec0a1f497ea4e316ff6b8a459b327fcbf Mon Sep 17 00:00:00 2001
From: RahulGautamSingh <rahultesnik@gmail.com>
Date: Fri, 1 Jul 2022 15:43:26 +0530
Subject: [PATCH] fix: move checkoutBranch after validation (#16246)
---
lib/workers/repository/update/branch/index.ts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/workers/repository/update/branch/index.ts b/lib/workers/repository/update/branch/index.ts
index 1e8c807b31..2936544fbb 100644
--- a/lib/workers/repository/update/branch/index.ts
+++ b/lib/workers/repository/update/branch/index.ts
@@ -84,9 +84,7 @@ export async function processBranch(
): Promise<ProcessBranchResult> {
let config: BranchConfig = { ...branchConfig };
logger.trace({ config }, 'processBranch()');
- await checkoutBranch(config.baseBranch!);
let branchExists = gitBranchExists(config.branchName);
-
if (!branchExists && config.branchPrefix !== config.branchPrefixOld) {
const branchName = config.branchName.replace(
config.branchPrefix!,
@@ -279,7 +277,8 @@ export async function processBranch(
'Branch + PR exists but is not scheduled -- will update if necessary'
);
}
-
+ await checkoutBranch(config.baseBranch!);
+ //stability checks
if (
config.upgrades.some(
(upgrade) =>
--
GitLab