fix: allow merge commits in PR validation - #57
Merged
Merged
Conversation
The PR workflow treated merge commits as invalid because it checked only the commit subject text. That made valid Git merge commits fail the Jira/Conventional Commit pattern check. The validation now ignores commits with more than one parent before applying the pattern, while still validating all normal single-parent commits.
ltshb
approved these changes
Sep 16, 2026
ltshb
left a comment
ltshb
left a comment
Contributor
There was a problem hiding this comment.
Would be probably good to also add this to swissgeo/.github
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.
The PR workflow treated merge commits as invalid because it checked only the commit subject text. That made valid Git merge commits fail the Jira/Conventional Commit pattern check.
The validation now ignores commits with more than one parent before applying the pattern, while still validating all normal single-parent commits.
For example the commit checks in this pr are failing with the current code, there are two merge commits in it.
https://github.com/geoadmin/bgdi-scripts/pull/2529/commits
seems like merge commits created with the
update branch buttonin the web gui are not whitelisted with the current implementation.