From 693963d9e14bb8a30b4cd6cc2580c982913e0ac1 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 18 Nov 2021 16:23:13 +0100
Subject: [PATCH] fix: catch prune branch error
---
lib/workers/repository/finalise/prune.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/workers/repository/finalise/prune.ts b/lib/workers/repository/finalise/prune.ts
index 8d2577a6c7..94cc51609d 100644
--- a/lib/workers/repository/finalise/prune.ts
+++ b/lib/workers/repository/finalise/prune.ts
@@ -69,7 +69,11 @@ async function cleanUpBranches(
await deleteBranch(branchName);
}
} catch (err) /* istanbul ignore next */ {
- if (err.message?.includes("bad revision 'origin/")) {
+ if (err.message === 'config-validation') {
+ logger.debug(
+ 'Cannot prune branch due to collision between tags and branch names'
+ );
+ } else if (err.message?.includes("bad revision 'origin/")) {
logger.debug(
{ branchName },
'Branch not found on origin when attempting to prune'
--
GitLab