Added prepare-commit-msg hook to check commit prefixes. #20381
+31
−2
Conversation
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
jacobtylerwalls
commented
Dec 8, 2025
Comment on lines
+22
to
+23
| # Cherry-pick the commit, but skip hooks | ||
| git -c core.hooksPath=/dev/null cherry-pick ${REV} |
Member
Author
There was a problem hiding this comment.
https://adamj.eu/tech/2023/02/13/git-skip-hooks/#skip-unskippable-hooks-with-core-hookspath
The hooks will run below, when git commit --amend is run.
Comment on lines
+3
to
+4
| # Install this prepare-commit-msg hook with | ||
| # pre-commit install --hook-type prepare-commit-msg |
Member
Author
There was a problem hiding this comment.
Here's the install step.
| # Cherry-pick the commit | ||
| git cherry-pick ${REV} | ||
| # Cherry-pick the commit, but skip hooks | ||
| git -c core.hooksPath=/dev/null cherry-pick ${REV} |
Member
Author
There was a problem hiding this comment.
It occurs to me this isn't windows-friendly, but we can cross that bridge later. Perhaps we would want to just replace the backport script entirely with a fleshed out prepare-commit-msg hook.
I confess to running `git cherry-pick` accidentally a few times instead of the backport script, resulting in missing branch prefixes.
9dd4663 to
410445f
Compare
jacobtylerwalls
commented
Dec 8, 2025
|
|
||
| # Cherry-pick the commit | ||
| git cherry-pick ${REV} | ||
| # Cherry-pick the commit, but skip hooks |
Member
Author
There was a problem hiding this comment.
This shows what we want -- I normally want the hook to catch naive uses of git cherry-pick, so I have to skip the hook here (where a naive cherry-pick is done intentionally).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
I confess to running
git cherry-pickaccidentally a few times instead of the backport script, resulting in missing branch prefixes.This should be invisible for most contributors, as
pre-commit installdoes not installprepare-commit-msghooks by default, see the installation command at the top of the script.