Skip to content

fix: handle git scissor line in commit message parsing (RDT-1556)#32

Merged
tomassebestik merged 1 commit into
espressif:masterfrom
oberwager:fix-scissor-line-handling
Dec 3, 2025
Merged

fix: handle git scissor line in commit message parsing (RDT-1556)#32
tomassebestik merged 1 commit into
espressif:masterfrom
oberwager:fix-scissor-line-handling

Conversation

@oberwager
Copy link
Copy Markdown
Collaborator

@oberwager oberwager commented Nov 14, 2025

Description

Fixes commit message validation failure when using git commit --verbose. The hook incorrectly validated diff content that appears after Git's scissor line (# ------------------------ >8 ------------------------), failing when diff lines exceeded the body length limit.

Changes:

  • Modified read_commit_message() to detect and strip content after the scissor line
  • Added test coverage for this scenario

Rationale: Git's scissor line behavior is documented to ignore everything after this marker, but the linter was processing the entire file including verbose output.

Related

Testing

  • All existing tests pass (65/65)
  • Added specific test case with scissor line + diff content
  • Manual testing with git commit --verbose confirms fix
  • No breaking changes to existing functionality

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 14, 2025

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello oberwager, we appreciate your contribution to this project!


📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.

Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against d5387bf

Copy link
Copy Markdown
Collaborator

@kumekay kumekay left a comment

Choose a reason for hiding this comment

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

@oberwager

Thank you for the contribution,
LGTM,

@tomassebestik Could you please have a quick look too?

@tomassebestik
Copy link
Copy Markdown
Member

LGTM as well, code change is clear and tests passes. Merging

@tomassebestik tomassebestik merged commit 552868c into espressif:master Dec 3, 2025
17 checks passed
@tomassebestik
Copy link
Copy Markdown
Member

tomassebestik commented Dec 3, 2025

@oberwager @kumekay The update is now available in new release version v1.11.0. 🎉

When a commit-linter version update is needed in your project, run:

pre-commit autoupdate --repo https://github.com/espressif/conventional-precommit-linter

while in the root of your Git project (local machine). This updates this hook version to the latest release.

Thank you both!

@github-actions github-actions Bot changed the title fix: handle git scissor line in commit message parsing fix: handle git scissor line in commit message parsing (RDT-1556) Dec 3, 2025
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.

3 participants