fix(ci): preserve GitHub Update branch merge exception - #220
Merged
Conversation
EXT-29 (PR #218) replaced the metadata-aware commit-range validator with a subject-only traversal, losing the exception for GitHub's trusted "Update branch" auto-merge commits. Restore it in validate-commit-range using a three-part predicate: a commit is skipped only when it has exactly two parents, the committer is GitHub <noreply@github.com>, and the subject matches `Merge branch '<base>' into <head>`. The git log format is expanded from `%s` to `%P%x01%cn%x01%ce%x01%s` (SOH-delimited) so parent hashes, committer name, and committer email are available in the loop alongside the subject. Add five new ExUnit tests covering the skip itself and each predicate variation (wrong name, wrong email, single parent, non-matching subject). Add documents/github-update-branch-validation-decision.adoc recording the rationale and alternatives considered. Refs: EXT-35
This was referenced Sep 5, 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
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.
Summary
validate-commit-rangefor GitHub's auto-generated "Update branch" merge commits, which was lost in EXT-29 (PR ci: harden Conventional Commit validators and Git test isolation #218).git logformat from%sto%P%x01%cn%x01%ce%x01%sso parent hashes, committer name, and committer email are available alongside the subject in the validation loop.GitHub <noreply@github.com>, subject matches^Merge branch '[^']+' into .+.documents/github-update-branch-validation-decision.adocrecording the rationale and alternatives considered.Test plan
mix cipasses (405 tests, no lint or format issues)Closes EXT-35
🤖 Generated with Claude Code