-
Notifications
You must be signed in to change notification settings - Fork 280
Update ReplaceBranch hook to avoid running on --amend by default
#725
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
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
This changes the default branch pattern to a simpler pattern. This is added to make understanding the hook and it's usage a bit easier.
This changes the spec to test against the same default branch replacement pattern specified in the default config. This is just to make things more consistent.
This makes the usage of this (hopefully) obvious to anyone reading it.
This makes the default behavior of this hook skip commits that explicitly give the SHA, i.e, `--amend`, `-c`, or `-C`. This is added because most people (I'd argue) don't want to run this hook on `amend`s.
This removes a trailing space after the repacement text, as well as `#strip`ing the replacement text.
--amend by default, change default pattern, improve docs--amend by default
This changes the specs for the ReplaceBranch hook to - test the contents of the file that `git` writes it's commit message to - explicitly set config variables instead of mocking them
Contributor
Author
|
Annoyingly, CI is complaining about a rubocop violation that doesn't exist. likely due to my force-pushes on this branch. |
sds
reviewed
Aug 12, 2020
Owner
|
Overall looks great. Once we get that one RuboCop line fixed we'll be good to merge. Thank you! |
Contributor
Author
|
Thanks - seems I was using rubocop with my global config, instead of this project's config. |
Owner
|
Thank you! |
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.
--amend