Skip to content
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

Allow for fixup! commits #225

Open
blaggacao opened this issue Jul 30, 2022 · 5 comments
Open

Allow for fixup! commits #225

blaggacao opened this issue Jul 30, 2022 · 5 comments

Comments

@blaggacao
Copy link

When using conventional commits, allow the use of fixup! <sha> or fixup! <header> syntax, which are both recognized by git rebase --autosquash later on.

@sdurrheimer
Copy link

Agreed, fixup! and squash! prefixes should be ignored as those mechanisms are part of the base features Git offers.

jbgi added a commit to jbgi/std that referenced this issue Oct 28, 2022
 workaround siderolabs/conform#225

 Also people very commonly use WIP commits before tidying up, so
 allowing them is probably necessary if we want people not disabling
 conform pre-commit hook.

 Note that this does not affect CI that should ideally still fail on
 WIP commits (TODO: run conform on CI).
jbgi added a commit to jbgi/std that referenced this issue Oct 28, 2022
 workaround siderolabs/conform#225

 Also people very commonly use WIP commits before tidying up, so
 allowing them is probably necessary if we want people not disabling
 conform pre-commit hook.

 Note that this does not affect CI that should ideally still fail on
 WIP commits (TODO: run conform on CI).
jbgi added a commit to jbgi/std that referenced this issue Oct 28, 2022
 workaround siderolabs/conform#225

 Also people very commonly use WIP commits before tidying up, so
 allowing them is probably necessary if we want people not disabling
 conform pre-commit hook.

 Note that this does not affect CI that should ideally still fail on
 WIP commits (TODO: run conform on CI).
blaggacao pushed a commit to divnix/std that referenced this issue Oct 28, 2022
 workaround siderolabs/conform#225

 Also people very commonly use WIP commits before tidying up, so
 allowing them is probably necessary if we want people not disabling
 conform pre-commit hook.

 Note that this does not affect CI that should ideally still fail on
 WIP commits (TODO: run conform on CI).
@janderssonse
Copy link
Contributor

janderssonse commented Feb 22, 2023

@blaggacao I did'n try this, but I think this could be solved by a setting in the .conform.yaml, just adding allowed types:

conventional:
      types: ["fixup!,"wip", "chore","docs","perf","refactor","style","test","release"]

@blaggacao
Copy link
Author

blaggacao commented Feb 25, 2023

That's a good idea, however we eneded up wrapping with a regex condition.

That gives more flexibility to the actual header and thereby less restriction to the end use: divnix/std@2f047e0

@janderssonse
Copy link
Contributor

Any way that works is the right way! :) Sidenote, I really like this tool, but would love to see more documentation, and more responses to the issues from the maintainer.

@terlar
Copy link

terlar commented Jun 1, 2024

The type fixup! and squash! won't work since it is in the format of fixup! previous commit message so it doesn't follow the format, it would have to be fixup!:. It would be nice with support for this without having to wrap conform in a shell script.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants