From 4db12f9ee903822e92ece66baa65eff38843cb0e Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 7 Jul 2020 08:02:35 +0200
Subject: [PATCH] fix: uncheck retry checkbox after rebase (#6691)

Closes #5951, Closes #6690
---
 lib/workers/branch/index.ts | 1 +
 lib/workers/pr/index.ts     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts
index 89c1554992a0ae..a23830b93321cd 100644
--- a/lib/workers/branch/index.ts
+++ b/lib/workers/branch/index.ts
@@ -453,6 +453,7 @@ export async function processBranch(
     // break if we pushed a new commit because status check are pretty sure pending but maybe not reported yet
     if (
       !masterIssueCheck &&
+      !config.rebaseRequested &&
       commitHash &&
       (config.requiredStatusChecks?.length || config.prCreation !== 'immediate')
     ) {
diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts
index d3bcfa7ea18127..70405d8394ce56 100644
--- a/lib/workers/pr/index.ts
+++ b/lib/workers/pr/index.ts
@@ -309,7 +309,7 @@ export async function ensurePr(
           },
           'PR title changed'
         );
-      } else if (!config.committedFiles) {
+      } else if (!config.committedFiles && !config.rebaseRequested) {
         logger.debug(
           {
             prTitle,