allow subtree merge commits #6
Merged
Conversation
This file contains 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
Problem: The PR validator rejects PRs that have incorporated third party repos with `git subtree` due to the use of subtree merge commits, which are merge commits, have no body, and the subject will typically exceed the hard limit of 70 characters. Add a new function for detecting subtree merge commits by looking for the pattern `Merge commit .* as .*`, which appears to be specific to subtree merges. Then, use this function to special case all the problem areas above so that subtree merges (and hopefully only subtree merges) are allowed.
|
I don't think we ever bothered to add mergify here, so want to just press the button @trws? |
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.
Problem: The PR validator rejects PRs that have incorporated third party repos with
git subtreedue to the use of subtree merge commits, which are merge commits, have no body, and the subject will typically exceed the hard limit of 70 characters.Add a new function for detecting subtree merge commits by looking for the pattern
Merge commit .* as .*, which appears to be specific to subtree merges. Then, use this function to special case all the problem areas above so that subtree merges (and hopefully only subtree merges) are allowed.