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

source-git: Squash patches by patch name #1309

Merged
merged 2 commits into from Jul 27, 2021
Merged

source-git: Squash patches by patch name #1309

merged 2 commits into from Jul 27, 2021

Conversation

csomh
Copy link
Contributor

@csomh csomh commented Jul 26, 2021

Instead of relying on a dedicated commit metadata field
(squash_commits), squash adjacent patch files if they have the same
name.

Keep the 'squash_commits' mechanism around for backwards compatibility.

Fixes #1271.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

Copy link
Member

@lachmanfrantisek lachmanfrantisek left a comment

Choose a reason for hiding this comment

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

Looks really good!

packit/patches.py Show resolved Hide resolved
Copy link
Member

@jpopelka jpopelka left a comment

Choose a reason for hiding this comment

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

Nice!

Hunor Csomortáni added 2 commits July 27, 2021 10:17
Instead of relying on a dedicated commit metadata field
(squash_commits), squash adjacent patch files if they have the same
name.

Keep the 'squash_commits' mechanism around for backwards compatibility.

Fixes #1271.

Signed-off-by: Hunor Csomortáni <csomh@redhat.com>
Signed-off-by: Hunor Csomortáni <csomh@redhat.com>
@csomh csomh added the mergeit When set, zuul wil gate and merge the PR. label Jul 27, 2021
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit e158b66 into packit:main Jul 27, 2021
@csomh csomh deleted the squash-on-patch-name branch June 3, 2022 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mergeit When set, zuul wil gate and merge the PR.
Projects
None yet
3 participants