From dd3250a8f5533f583dc34457a35d339d53fb344a Mon Sep 17 00:00:00 2001
From: Christian Dupuis <cd@atomist.com>
Date: Thu, 10 Sep 2020 21:48:17 +0200
Subject: [PATCH] Fix auto-merge on checks with no checks

[changelog:fixed]
---
 lib/autoMerge.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/autoMerge.ts b/lib/autoMerge.ts
index 45f85d3..bb51a34 100644
--- a/lib/autoMerge.ts
+++ b/lib/autoMerge.ts
@@ -245,7 +245,11 @@ const CheckAutoMergeRule: AutoMergeRule = {
 				return false;
 			}
 		}
-		return true;
+		return !isPrTagged(
+			pr,
+			AutoMergeCheckSuccessLabel,
+			AutoMergeCheckSuccessTag,
+		);
 	},
 };
 
@@ -340,7 +344,7 @@ export async function executeAutoMerge(
 	if (pr.state !== "open") {
 		await ctx.audit.log(`Pull request auto-merge ignoring closed ${slug}`);
 		return status
-			.success(`Pull request auto-merge ignoring closed ${slug}`)
+			.success(`Pull request auto-merge ignoring closed ${link}`)
 			.hidden();
 	}
 
@@ -401,7 +405,7 @@ export async function executeAutoMerge(
 			)}`,
 		);
 		return status.success(
-			`Pull request auto-merge not enabled for ${slug}.`,
+			`Pull request auto-merge not enabled for ${link}.`,
 		);
 	}