The pre-commit.protect-master should protect more than just master #8
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
lillialexis
requested review from
jeresig,
ioanacrant,
kevinb-khan and
a team
lillialexis
commented
Nov 8, 2024
| if [ "`git rev-parse --abbrev-ref HEAD`" = "master" ]; then | ||
| echo "FATAL ERROR: You cannot commit directly to the master branch." | ||
| echo "Commit to a deploy branch instead:" | ||
| echo " https://khanacademy.org/r/git-at-ka" |
There was a problem hiding this comment.
this link went nowhere...
csilvers
approved these changes
Nov 9, 2024
| for branch in $KNOWN_DEPLOY_BRANCHES; do | ||
| if [ "$CURRENT_BRANCH" = "$branch" ]; then | ||
| echo "FATAL ERROR: You cannot commit directly to the $CURRENT_BRANCH branch." | ||
| echo "Make a pull-request (or audit) and land it to this branch instead" |
There was a problem hiding this comment.
Maybe: "You cannot commit directly to the ... branch because you've told OLC it's a deploy branch." And also give instructions on how to tell OLC it's not a deploy branch, if that was in error.
jeresig
approved these changes
Nov 12, 2024
ioanacrant
approved these changes
Nov 13, 2024
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:
Now it stops users from accidentally committing to
main, a few other known branches (for mobile) and any of their target/deploy branches.This can stop people from accidentally committing straight to a deploy branch, which 95% of the time, you never want to do. Can always just
git commit -nif they reallllly need to get around it (But they never should!! security reasons!! committing directly to a deploy branch bypasses PRs!! They should use an audit if they have to...)Issue: FEI-5966
Test plan:
main