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

feat: handle fixup and squash messages #27

Merged
merged 3 commits into from
Jul 24, 2024

Conversation

tomassebestik
Copy link
Member

This PR handles the usage of the git commit --fixup command.

Fixup and squash messages are ignored by commit linter as they are temporary and will not remain in the git history.

Related

  • Closes RDT-537

Copy link

github-actions bot commented Jul 9, 2024

Messages
📖 You might consider squashing your 3 commits (simplifying branch history).

👋 Hello tomassebestik, we appreciate your contribution to this project!


📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.

Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- Addressing info messages (📖) is strongly recommended; they're less critical but valuable.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against d749ab7

@tomassebestik
Copy link
Member Author

FYI @KonstantinKondrashov : That should solve your request described in internal JIRA RDT-537

@tomassebestik tomassebestik requested a review from kumekay July 9, 2024 08:16
@tomassebestik tomassebestik self-assigned this Jul 11, 2024
@tomassebestik tomassebestik force-pushed the feat/ignore-git-fixup-messages branch from d5a454d to d749ab7 Compare July 12, 2024 07:23
Copy link
Collaborator

@kumekay kumekay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomassebestik Thank you for the PR, the solution is ok, but how can we be sure that these fixup commits will always be squashed before the merge?

.github/CODEOWNERS Show resolved Hide resolved
@tomassebestik
Copy link
Member Author

tomassebestik commented Jul 17, 2024

@tomassebestik Thank you for the PR, the solution is ok, but how can we be sure that these fixup commits will always be squashed before the merge?

@kumekay I understand your concern, but this is probably beyond what this tool is capable of. Usually, a pre-commit linter is used along with Danger (GL or GH), and cases like unsquashed fixup commits will be caught by Danger.

I don't think it would be very wise to try implement additional logic for that in the pre-commit hook for the commit linter since we probably want to keep this tool simple and straightforward. WDYT?

@tomassebestik tomassebestik merged commit ad4f734 into master Jul 24, 2024
16 checks passed
@tomassebestik tomassebestik deleted the feat/ignore-git-fixup-messages branch July 24, 2024 06:38
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

Successfully merging this pull request may close these issues.

2 participants