Skip to content

[ci] Add fixup! commit check for pull requests#4878

Open
gulyasgergely902 wants to merge 1 commit into
Ericsson:masterfrom
gulyasgergely902:add-fixup-check-github-workflow
Open

[ci] Add fixup! commit check for pull requests#4878
gulyasgergely902 wants to merge 1 commit into
Ericsson:masterfrom
gulyasgergely902:add-fixup-check-github-workflow

Conversation

@gulyasgergely902

Copy link
Copy Markdown
Collaborator

The fixup! commit check workflow will check any commits on a given pull request and fail if there is any. This way it is enforced to squash all fixup! commits which were made with the argument '--fixup=...' when committing.

@gulyasgergely902 gulyasgergely902 force-pushed the add-fixup-check-github-workflow branch 5 times, most recently from f934428 to 2d6fb6a Compare June 5, 2026 11:47
The fixup! commit check workflow will check any commits on a given
pull request and fail if there is any. This way it is enforced to
squash all fixup! commits which were made with the argument
'--fixup=...' when committing.
@gulyasgergely902 gulyasgergely902 force-pushed the add-fixup-check-github-workflow branch 2 times, most recently from 4af9b70 to 52a7867 Compare June 5, 2026 12:48
@gulyasgergely902 gulyasgergely902 changed the title [ci] Add fixup! commit check for pull requests - DO-NOT-MERGE [ci] Add fixup! commit check for pull requests Jun 5, 2026
@gulyasgergely902 gulyasgergely902 added this to the release 6.29.0 milestone Jun 5, 2026
@gamesh411

Copy link
Copy Markdown
Contributor

Thanks for the attention to detail and for being conscious of code quality in this regard as well, @gulyasgergely902.
I would be interested in your experience that led you to propose this change. Did you find accidentally left-in fixup commits? Doesn't the "squash and merge" GitHub workflow eliminate those (for example, if there is a meaningful change with a meaningful commit message, and then there are some other commits on top of that)? Or is this targeting PRs where the only commit is a fixup commit?
I'm not against or for this, just curious :)

@gulyasgergely902

Copy link
Copy Markdown
Collaborator Author

So basically, this workflow is for the specific case which the new git workflow is describing: After the developer opened the PR for the changes made and the reviewer found any bugs/mistakes/etc., the developer should fix those in a fixup! commit made with --fixup=. This makes checking what changes were pushed in a response to the requests easier. After everything was fixed and the reviewer is happy with the results, asks the developer to squash the changes with --autosquash in a rebase command. This makes every fixup squashed to the right commit where it belongs. This automation guards the git tree of an accidental merge with fixup commits still present.
You can read the new workflow in the CONTRIBUTING file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants