From 9354b5e36c932d2da9ee1ba582d7f80018a106cf Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Mon, 10 Sep 2018 12:04:27 +0200 Subject: [PATCH] fix(gitfs): add try/catch around deleteBranch --- lib/platform/git/storage.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/platform/git/storage.js b/lib/platform/git/storage.js index b865d279ac..c3ad6976bd 100644 --- a/lib/platform/git/storage.js +++ b/lib/platform/git/storage.js @@ -182,11 +182,15 @@ class Storage { } async function deleteBranch(branchName) { - await git.raw(['push', '--delete', 'origin', branchName]); + try { + await git.raw(['push', '--delete', 'origin', branchName]); + } catch (err) /* istanbul ignore next */ { + logger.warn({ branchName, err }, 'Error deleting remote branch'); + } try { await deleteLocalBranch(branchName); } catch (ex) { - // local branch may not exist + logger.debug({ branchName }, 'Could not delete remote branch'); } } -- GitLab