fix(scripts/check_emdash.sh): skip emdash check when no diff base is available#26491
Merged
f0ssel merged 1 commit intoJun 17, 2026
Merged
Conversation
The emdash/endash check is a diff gate for pull requests: it resolves the merge-base against the target branch and only inspects added lines. When no base ref can be resolved, the script fell back to scanning every tracked file. Push builds on release branches hit exactly this case. The lint job checks out with fetch-depth: 1, so origin/main is absent, and GITHUB_BASE_REF is only set for pull_request events. With no base ref, the whole-tree scan flags the many pre-existing emdash/endash characters already in the repo and fails lint/emdash, even though the build introduced none of them. Skip the check in that case instead of scanning everything. A full scan is still available explicitly via --all.
johnstcn
approved these changes
Jun 17, 2026
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
2 participants
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.
Backport of #26489 to
release/2.33.Problem
scripts/check_emdash.shonly resolves a base ref for pull requests (GITHUB_BASE_REF) or whenorigin/mainis present. Thelintjob checks out withfetch-depth: 1, so on a release-branch push neither is available, and the script falls back to scanning every tracked file, flagging pre-existing emdash/endash characters the build did not introduce. This is the same failure mode seen on therelease/2.34push build (run 27704528068);release/2.33carries the same script and the same bug.Fix
When no base ref can be determined (outside a pull request), skip the check instead of scanning the whole tree.
--allstill forces a full scan.Note: this branch carries an older variant of the script than
main, so the change is applied by hand rather than cherry-picked, but the behavior matches #26489.Testing
GITHUB_BASE_REF, noorigin/main): old script scans all files and fails on a pre-existing emdash; patched script skips and exits 0.shellcheck,shfmt,bash -nclean.Generated by Coder Agents on behalf of @f0ssel.