• Fixes signed-off-by rule rejecting cherry-picked commits
• Filters out cherry-pick trailer lines during validation
• Adds test case for cherry-pick scenario

Filter cherry-pick trailer lines in validation

• Added filter to skip lines starting with cherry picked from commit
• Preserves existing comment filtering logic
• Allows commits with both Signed-off-by and cherry-pick trailers to pass validation

@commitlint/rules/src/signed-off-by.ts

Add cherry-pick scenario test coverage

• Added new test message withSignoffAndCherryPick with both trailers
• Added parsed variant for the new test message
• Added test case verifying cherry-pick commits pass with always mode

@commitlint/rules/src/signed-off-by.test.ts

Description

Git's cherry-pick -x appends (cherry picked from commit <hash>) with a leading (, but the
filter uses ln.startsWith("cherry picked from commit") (no parenthesis), so real cherry-picked
commits produced by git will not be filtered and commitlint will still fail on them. The test
fixture also omits the parenthesis, so it does not exercise the real git output.

Code

@commitlint/rules/src/signed-off-by.ts[R14-15]

+			// skip cherry pick commits
+			!ln.startsWith("cherry picked from commit") &&

Evidence

Compliance rule 7 requires that commitlint correctly handles the `(cherry picked from commit
<hash>) line appended by git cherry-pick -x. Git's actual output includes a leading (`, but the
added filter !ln.startsWith("cherry picked from commit") omits it, meaning the pattern never
matches real git cherry-pick output. The test fixture at line 27 also uses `cherry picked from
commit 123` (no parenthesis), so the test passes but does not validate the real scenario.

Commitlint Passes on Cherry-Picked Commits
@commitlint/rules/src/signed-off-by.ts[14-15]
@commitlint/rules/src/signed-off-by.test.ts[27-27]

Agent prompt

The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

## Issue description
The filter added to skip cherry-pick lines uses `ln.startsWith("cherry picked from commit")`, but `git cherry-pick -x` actually appends `(cherry picked from commit <hash>)` — with a leading parenthesis `(`. The current pattern will never match real git output, leaving the original bug unfixed.

## Issue Context
Git's `-x` flag appends a line of the form `(cherry picked from commit <hash>)` to the commit message body. The test fixture at line 27 also lacks the parenthesis (`cherry picked from commit 123`), so the test passes but does not exercise the real git format, giving a false sense of correctness.

## Fix Focus Areas
- @commitlint/rules/src/signed-off-by.ts[15-15] — change `"cherry picked from commit"` to `"(cherry picked from commit"`
- @commitlint/rules/src/signed-off-by.test.ts[27-27] — update test message from `cherry picked from commit 123` to `(cherry picked from commit 123)`

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

Description

The new test fixture withSignoffAndCherryPick uses cherry picked from commit 123 (no
parentheses), which is a format that git cherry-pick -x never produces. Because both the fixture
and the implementation share the same incorrect format, the test passes while the real-world
scenario remains completely untested and broken.

Code

@commitlint/rules/src/signed-off-by.test.ts[R21-28]

+	withSignoffAndCherryPick: `test: subject
+
+message body
+
+Signed-off-by:
+
+cherry picked from commit 123
`,

Evidence

The fixture at lines 21-28 omits the parentheses that git always adds. The PR description's own
usage example also uses the wrong format (cherry picked from commit 123). Because the
implementation filter was written to match this same wrong format, the test passes — but it
validates a message that real git never generates. A grep for \(cherry picked across the entire
repo returns zero results, confirming the actual git format is never exercised.

@commitlint/rules/src/signed-off-by.test.ts[21-28]
@commitlint/rules/src/signed-off-by.test.ts[123-131]

Agent prompt

The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

## Issue description
The test fixture `withSignoffAndCherryPick` uses `cherry picked from commit 123` without parentheses. The actual output of `git cherry-pick -x` is `(cherry picked from commit <sha>)`. The fixture must be updated to reflect the real format so the test provides meaningful coverage.

## Issue Context
The implementation filter and the fixture were both written with the wrong format, so they agree with each other but both disagree with reality. Fixing only the fixture (without fixing the implementation) will cause the test to fail, which is the correct signal that the implementation also needs to be fixed.

## Fix Focus Areas
- @commitlint/rules/src/signed-off-by.test.ts[21-28]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools