From 453f936d07bc5491e6aa58d1d8e17ad5ccd6aca4 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 17 Oct 2018 12:19:21 +0200
Subject: [PATCH] fix(gitFs): throw if remote branch missing (#2664)
---
lib/platform/git/storage.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/platform/git/storage.js b/lib/platform/git/storage.js
index 137b5fddd2..d8fd71d713 100644
--- a/lib/platform/git/storage.js
+++ b/lib/platform/git/storage.js
@@ -193,12 +193,13 @@ class Storage {
try {
await git.raw(['push', '--delete', 'origin', branchName]);
} catch (err) /* istanbul ignore next */ {
- logger.warn({ branchName, err }, 'Error deleting remote branch');
+ logger.info({ branchName, err }, 'Error deleting remote branch');
+ throw new Error('repository-changed');
}
try {
await deleteLocalBranch(branchName);
- } catch (ex) {
- logger.debug({ branchName }, 'Could not delete remote branch');
+ } catch (err) {
+ logger.debug({ branchName, err }, 'Could not delete local branch');
}
}
--
GitLab