From 22a8cc68f127b1bbeeac1f52a1b04465da142199 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 25 Aug 2022 21:56:32 +0200
Subject: [PATCH] =?UTF-8?q?chore:=20use=20=E2=80=9Cbehind=20base=20branch?=
=?UTF-8?q?=E2=80=9D=20not=20=E2=80=9Cstale=E2=80=9D=20(#17417)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/usage/updating-rebasing.md | 2 +-
lib/workers/repository/update/branch/index.ts | 2 +-
lib/workers/repository/update/branch/reuse.ts | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/usage/updating-rebasing.md b/docs/usage/updating-rebasing.md
index 35eae7b54b..6bc63ac18d 100644
--- a/docs/usage/updating-rebasing.md
+++ b/docs/usage/updating-rebasing.md
@@ -59,6 +59,6 @@ The label name is configurable via the `rebaseLabel` option.
If you apply a rebase label then Renovate will regenerate its commit for the branch, even if the branch has been modified.
The rebase label is useful in situations like:
-- If a branch is stale but you don't have `rebaseWhen=behind-base-branch` enabled
+- If a branch is behind the base branch but you don't have `rebaseWhen=behind-base-branch` enabled
- If a branch has been edited and you want to discard the edits and have Renovate create it again
- If a branch was created with an error (e.g. lockfile generation) and you want Renovate to try again
diff --git a/lib/workers/repository/update/branch/index.ts b/lib/workers/repository/update/branch/index.ts
index c289be6305..62ed7989a7 100644
--- a/lib/workers/repository/update/branch/index.ts
+++ b/lib/workers/repository/update/branch/index.ts
@@ -590,7 +590,7 @@ export async function processBranch(
['conflicted', 'never'].includes(config.rebaseWhen!)
) {
logger.warn(
- 'Branch cannot automerge because it is stale and rebaseWhen setting disallows rebasing - raising a PR instead'
+ 'Branch cannot automerge because it is behind base branch and rebaseWhen setting disallows rebasing - raising a PR instead'
);
config.forcePr = true;
config.branchAutomergeFailureMessage = mergeStatus;
diff --git a/lib/workers/repository/update/branch/reuse.ts b/lib/workers/repository/update/branch/reuse.ts
index 2f1e75d576..386f7c62a0 100644
--- a/lib/workers/repository/update/branch/reuse.ts
+++ b/lib/workers/repository/update/branch/reuse.ts
@@ -63,7 +63,7 @@ export async function shouldReuseExistingBranch(
(config.automerge || (await platform.getRepoForceRebase())))
) {
if (await isBranchBehindBase(branchName)) {
- logger.debug(`Branch is stale and needs rebasing`);
+ logger.debug(`Branch is behind base branch and needs rebasing`);
// We can rebase the branch only if no PR or PR can be rebased
if (await isBranchModified(branchName)) {
logger.debug('Cannot rebase branch as it has been modified');
@@ -77,7 +77,7 @@ export async function shouldReuseExistingBranch(
logger.debug('Branch is up-to-date');
} else {
logger.debug(
- `Skipping stale branch check due to rebaseWhen=${config.rebaseWhen!}`
+ `Skipping behind base branch check due to rebaseWhen=${config.rebaseWhen!}`
);
}
--
GitLab