Skip to content

Commit

Permalink
fix: uncheck retry checkbox after rebase (#6691)
Browse files Browse the repository at this point in the history
Closes #5951, Closes #6690
  • Loading branch information
rarkins committed Jul 7, 2020
1 parent 7d3b475 commit 4db12f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/workers/branch/index.ts
Expand Up @@ -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')
) {
Expand Down
2 changes: 1 addition & 1 deletion lib/workers/pr/index.ts
Expand Up @@ -309,7 +309,7 @@ export async function ensurePr(
},
'PR title changed'
);
} else if (!config.committedFiles) {
} else if (!config.committedFiles && !config.rebaseRequested) {
logger.debug(
{
prTitle,
Expand Down

0 comments on commit 4db12f9

Please sign in to comment.