Repository navigation
π Treat changelog-only base moves as current in the current-base gate - #19270
Merged
Merged
Conversation
A head behind its base only by commits touching the root CHANGELOG.md or changelog.d/ is reported current instead of being sent to base preparation. Fails closed on a missing merge base, API error, truncated compare or any other path. Fixes #19269 Signed-off-by: Andy Anderson <andy@clubanderson.com>
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Mutation testinggremlins found 3 surviving mutant(s) in changed files: the code ran under tests, but changing it did not fail any test.
Verdict: |
This was referenced Nov 19, 2026
Contributor
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #19269
What
currentBaseGatenow checks, when a head is behind, whether the base moved only by changelog bookkeeping. It compares the PR's merge base with the base tip; if every changed file is the rootCHANGELOG.mdor under the rootchangelog.d/(constantschangelogOnlyFileandchangelogOnlyFragmentDir) and the PR changes none of those same files, the head is reported current and logged withreason="behind only by changelog-only commits". It is not refreshed and does not enter base preparation.Fail closed
Any of these keeps today's behavior (stale, refreshed): missing merge base, API error on the second compare, compare status other than
ahead, zero commits, an empty file list, a file list at or above GitHub's 300-file cap on either side (compareFilesResponseCap), a renamed path whose previous name is off the allowlist, or a changelog path the PR also changes.Why
On
v5, 58 of 258 base moves in 48h (22%) were CHANGELOG-only release-gate merges, and each refresh costs about 16 workflow runs and 38 runner-minutes.Tests
TestCurrentBaseGateChangelogOnlyBaseMovecovers changelog-only (current), fragments-only (current), mixed (stale), nesteddocs/CHANGELOG.md(stale), API error (stale), truncated list (stale), empty list (stale), unexpected status (stale), overlap with the PR (stale), missing merge base (stale, no second compare) and zero behind (unchanged).TestIsChangelogOnlyPathpins the allowlist.Docs:
src/docs/hive-merge.mdpreparation section. Changelog fragment included.