From 4e1ace3a85de3202db3e91fb1ed04113167635d1 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 15 Sep 2020 12:05:19 +0200
Subject: [PATCH] fix(git): gracefully abort for bad revision errors

---
 lib/workers/branch/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts
index b053b41a2c..a292b4a013 100644
--- a/lib/workers/branch/index.ts
+++ b/lib/workers/branch/index.ts
@@ -544,6 +544,9 @@ export async function processBranch(
       err.message.includes('fatal: Authentication failed')
     ) {
       throw new Error(PLATFORM_AUTHENTICATION_ERROR);
+    } else if (err.message?.includes('fatal: bad revision')) {
+      logger.debug({ err }, 'Aborting job due to bad revision error');
+      throw new Error(REPOSITORY_CHANGED);
     } else if (!(err instanceof ExternalHostError)) {
       logger.error({ err }, `Error updating branch: ${String(err.message)}`);
     }
-- 
GitLab