.pre-commit-config.yaml: disallow commiting to version branches #4494
Conversation
This file contains 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
uklotzde
approved these changes
Oct 30, 2021
daschuer
requested changes
Oct 31, 2021
.pre-commit-config.yaml
Outdated
| @@ -51,6 +51,8 @@ repos: | |||
| - commit | |||
| - manual | |||
| - id: no-commit-to-branch | |||
| # protect main and any branch that has a semver-like name | |||
| args: [-b, main, -p, '^\d+.\d+(?:.\d)*$'] | |||
There was a problem hiding this comment.
The dot needs to be escaped to not match any character.
We also don't have more than three versions
Can we just:
Suggested change
| args: [-b, main, -p, '^\d+.\d+(?:.\d)*$'] | |
| args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$'] |
for 2.4 / 244.35235 / 2.4.1?
There was a problem hiding this comment.
Thanks, I forgot the dot was a special character too.
The regex you proposed was exactly what I intended, I just wrote it down incorrectly.
before this commit, it was possible to accidentally commit to the stable version branches (such as 2.3). If this was done by a member with push access, they could push untested commits into production on accident. If this was done by a git newbie, they would mess up their local branch and deal with conflicts when pulling their branch later. If commiting to the branch is justified, the check can be bypassed by `SKIP=no-commit-to-branch git commit`
Swiftb0y
force-pushed
the
pre-commit-disallow-committing-to-version-branches
branch
from
bb54189
to
769ba03
Compare
daschuer
approved these changes
Oct 31, 2021
|
Thank you. |
Swiftb0y
deleted the
pre-commit-disallow-committing-to-version-branches
branch
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.
before this commit, it was possible to accidentally commit to
the stable version branches (such as 2.3). If this was done
by a member with push access, they could push untested commits
into production on accident. If this was done by a git newbie,
they would mess up their local branch and deal with conflicts
when pulling their branch later. If commiting to the branch
is justified, the check can be bypassed by
SKIP=no-commit-to-branch git commit