Skip to content

Commit

Permalink
chore: improve logging for stale branch rebase (#13009)
Browse files Browse the repository at this point in the history
Co-authored-by: Rhys Arkins <rhys@arkins.net>
  • Loading branch information
osigida and rarkins committed Dec 8, 2021
1 parent 052e92e commit 12f467a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/util/git/index.ts
Expand Up @@ -556,6 +556,7 @@ export async function isBranchModified(branchName: string): Promise<boolean> {
config.ignoredAuthors.some((ignoredAuthor) => lastAuthor === ignoredAuthor)
) {
// author matches - branch has not been modified
logger.debug({ branchName }, 'Branch has not been modified');
config.branchIsModified[branchName] = false;
return false;
}
Expand Down
1 change: 1 addition & 0 deletions lib/workers/branch/reuse.ts
Expand Up @@ -60,6 +60,7 @@ export async function shouldReuseExistingBranch(
logger.debug('Cannot rebase branch as it has been modified');
return { reuseExistingBranch: true, isModified: true };
}
logger.debug('Branch is unmodified, so can be rebased');
return { reuseExistingBranch: false };
}
logger.debug('Branch is up-to-date');
Expand Down

0 comments on commit 12f467a

Please sign in to comment.