From 6fdffed9d2b80a36ff82cae5e938899b02f04db3 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sun, 30 Aug 2020 09:54:54 +0200
Subject: [PATCH] refactor: externalize syncBranch from branchExists
---
lib/util/git/index.ts | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index 00be3babe4..8ffe55b7a8 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -298,12 +298,7 @@ export async function createBranch(
config.branchIsModified[branchName] = false;
}
-export async function branchExists(branchName: string): Promise<boolean> {
- await syncGit();
- // First check cache
- if (config.branchExists[branchName] !== undefined) {
- return config.branchExists[branchName];
- }
+async function syncBranch(branchName: string): Promise<void> {
if (!branchName.startsWith(config.branchPrefix)) {
// fetch the branch only if it's not part of the existing branchPrefix
try {
@@ -313,6 +308,15 @@ export async function branchExists(branchName: string): Promise<boolean> {
checkForPlatformFailure(err);
}
}
+}
+
+export async function branchExists(branchName: string): Promise<boolean> {
+ await syncGit();
+ // First check cache
+ if (config.branchExists[branchName] !== undefined) {
+ return config.branchExists[branchName];
+ }
+ await syncBranch(branchName);
try {
await git.raw(['show-branch', 'origin/' + branchName]);
config.branchExists[branchName] = true;
--
GitLab