diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index 858ee3a0680fa99669113fd64d25d4d589a982e3..0a4e718d01b94659adf71667b64dfc2fd8862251 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -178,11 +178,11 @@ async function processBranch(branchConfig, packageFiles) { } } - const committedFiles = await commitFilesToBranch(config); + config.committedFiles = await commitFilesToBranch(config); // istanbul ignore if if ( config.updateType === 'lockFileMaintenance' && - !committedFiles && + !config.committedFiles && !config.parentBranch && branchExists ) { @@ -192,7 +192,7 @@ async function processBranch(branchConfig, packageFiles) { await platform.deleteBranch(config.branchName); return 'done'; } - if (!(committedFiles || branchExists)) { + if (!(config.committedFiles || branchExists)) { return 'no-work'; } diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js index aba4a1a38a3c49a5ff7a8f49182914e391c61828..1cf84ff4dfe3053b1532e73dfd740ee98a9cd4d3 100644 --- a/lib/workers/pr/index.js +++ b/lib/workers/pr/index.js @@ -233,7 +233,7 @@ async function ensurePr(prConfig) { }, 'PR title changed' ); - } else { + } else if (!config.committedFiles) { logger.debug( { prTitle, @@ -245,7 +245,10 @@ async function ensurePr(prConfig) { } await platform.updatePr(existingPr.number, prTitle, prBody); - logger.info({ pr: existingPr.number }, `PR updated`); + logger.info( + { committedFiles: config.committedFiles, pr: existingPr.number }, + `PR updated` + ); return existingPr; } logger.debug({ branchName, prTitle }, `Creating PR`);