feat(check): add --no-merge option to reject merge commits#47
Closed
gcornut wants to merge 1 commit into
Closed
Conversation
Member
Author
Member
Author
|
We will actually have a GH repo config that does that better |
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.
By default, merge commits are silently skipped. This adds a
--no-mergeoption to fail on merge commits instead, useful for enforcing a rebase workflow in CI.Let me know if there any cases where adding this on our PR CI would be a bad idea.
Changes
check_message.sh:--no-mergeflag (orCOMMIT_VALIDATOR_NO_MERGEenv var) makes merge commits fail instead of being skipped, both forMERGE_MSGpath and message-based detection.check.sh: whenCOMMIT_VALIDATOR_NO_MERGEis set, merge commits are included in the validated range and rejected.action.yml: newno_mergeinput wired toCOMMIT_VALIDATOR_NO_MERGE.Note on GitHub Actions pull_request workflows
When a
pull_requestworkflow runs,HEADis not the PR's head commit — GitHub creates a synthetic merge commit (PR branch merged into base) that is never pushed to the repository. Withno_merge: "true", this could cause a false positive if the validated range includedHEAD.This is safe because the action already passes an explicit range using
base.sha..head.sha, so the synthetic merge commit atHEADis never part of the validated range.