chore(release-skill): resolve branch commit vs. commit-msg hook conflict#285
Merged
Conversation
The skill instructed `git commit -m "Release vX.Y.Z"` on the release branch, but the repo's `commit-msg` hook (`.cargo-husky/hooks/commit-msg`) rejects that subject — it enforces conventional-commit prefixes and only exempts `chore(release)`. This surfaced during the v0.17.0 cut. GitHub derives the squash-merge subject on `master` from the **PR title**, not the branch commit, so the fix is to use two different subjects: - Branch commit: `chore(release): vX.Y.Z` (passes the hook) - PR title: `Release vX.Y.Z` (becomes the squash-merge subject, which downstream tooling matches via `^Release v[0-9]+\.[0-9]+\.[0-9]+ \(#[0-9]+\)$`) This avoids `--no-verify` and keeps both the local hook and the downstream tag regex satisfied. Updated SKILL.md Phase 4 step 2 and COMMIT_CONVENTIONS.md with the two-subject pattern and an explicit "do not" entry against `--no-verify`.
This file contains hidden or 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
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.
Summary
During the v0.17.0 release cut, Phase 4 step 2 of the release skill hit the repo's
commit-msghook:SKILL.mdinstructedgit commit -m \"Release vX.Y.Z\"on the release branch..cargo-husky/hooks/commit-msg) rejects that subject — it enforces conventional-commit prefixes and only exemptschore(release).The fix exploits the fact that GitHub derives the squash-merge subject on `master` from the PR title, not the branch commit. So the skill now uses two different subjects:
Changes
Test plan