-
Notifications
You must be signed in to change notification settings - Fork 7
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
feat: check all autosquash messages #395
Conversation
For myself, I don't think I'd consider this a major breaking change. Its a minor breaking change that expands functionality to cover cases that either didn't exist or were unknown at the time of creation. |
I would have considered this to be a breaking change, but if you don't, you should then use a squash-and-rebase instead of a merge. This way, you can ensure the commit message is exactly as you want. |
This is blocked on CI. Since you have to edit this anyways, please remove |
Head branch was pushed to by a user without write access
4e3d3f9
to
b458f39
Compare
As requested I have removed the breaking change exclamation from the commit message. I do not know if CI is fixed yet though. |
Looks like |
Pull Request Test Coverage Report for Build 12404415424Details
💛 - Coveralls |
Committed, until now, only supported the `fixup!` prefix. The standard Git implementation of `--autosquash` also supports `squash!` and `amend!`. This commit modifies the logic of the handling of `fixup!` to support the other two prefixes in the same way. Note that this purely changes the logic. Function names and options remain unchanged to ensure backwards compatibility. It may be worth considering renaming this to `autosquash` given it is motivated primarily by Git's `--autosquash` flag. Ref: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash Signed-off-by: JP-Ellis <[email protected]>
b458f39
to
30ff2c6
Compare
Rebased the PR on top of master so it can merge. |
Expand the autosquash prefixes from just
fixup!
to now includesquash!
andamend!
. These are the prefixes supported by default when using Git's--autosquash
.To keep the commits atomic as requested in #394, this commit only changes the functionality, while leaving the configuration as is (thereby creating an mismatch between the config naming, and resulting behaviour)
EDIT: New commit message will be:
Committed, until now, only supported the
fixup!
prefix. The standard Git implementation of--autosquash
also supportssquash!
andamend!
. This commit modifies the logic of the handling offixup!
to support the other two prefixes in the same way.Note that this purely changes the logic. Function names and options remain unchanged to ensure backwards compatibility. It may be worth considering renaming this to
autosquash
given it is motivated primarily by Git's--autosquash
flag.Ref: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash