Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: improve logging for stale branch rebase #13009

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/util/git/index.ts
Expand Up @@ -520,6 +520,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 has no changes, but we will not use it');
osigida marked this conversation as resolved.
Show resolved Hide resolved
return { reuseExistingBranch: false };
}
logger.debug('Branch is up-to-date');
Expand Down