Skip to content

Conversation

@bagowix
Copy link
Contributor

@bagowix bagowix commented Apr 29, 2025

Closes #132
Closes #133

Description:
Improved the is_merge method to detect a broader range of standard Git merge commit formats. Instead of checking only for merge branch, it now supports:

  • Merge branch ...
  • Merge pull request ...
  • Merge remote-tracking branch ...
  • Merge tag ...
  • Merge ... into ...

Relevant test cases have been added to ensure robustness.

Motivation:
This avoids false positives from the Conventional Commit hook when developers use standard merge commits in workflows (e.g. merging main into feature branches).

Copy link
Member

@thekaveman thekaveman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastic, thank you for the clean implementation and the tests!

@thekaveman thekaveman merged commit fa1915d into compilerla:main Apr 29, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support --allow-merge-commits flag to skip validation of merge commits

2 participants