phpro / grumphp

A PHP code-quality tool
MIT License
4.15k stars 434 forks source link

skip additional checks if a merge commit #1100

Closed delboy1978uk closed 1 year ago

delboy1978uk commented 1 year ago
Q A
Branch master for features and deprecations
Bug fix? no
New feature? yes
BC breaks? no
Deprecations? no
Documented? no
Fixed tickets https://github.com/phpro/grumphp/issues/1099

This PR makes Grump skip commit message checks (beyond the defaults) if it is a merge commit. This stops problems like JIRA ticket numbers not being in the main branches like master and develop.

veewee commented 1 year ago

Thanks for the addition

delboy1978uk commented 1 year ago

@veewee Thanks so much for merging this feature! Can I also create a PR for v1.x ?

veewee commented 1 year ago

I wasn't really planning of porting new features back to v1 because of the maintenance overhead.

delboy1978uk commented 1 year ago

@veewee Understandable, I'll use a fork of my own until the rest of the servers where I'm working are on PHP 8.1 (which shouldn't be long now). I'm looking forward to the release! Thanks again :D