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

Default squash-merge behaviour must be OFF #8483

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

arielshaqed
Copy link
Contributor

My original PR introduced an entirely wrong behaviour which is also a breaking change. Fix this bad default.

Closes #8482.

@arielshaqed arielshaqed requested review from N-o-Z and itaiad200 January 9, 2025 15:38
@arielshaqed arielshaqed added bug Something isn't working area/API Improvements or additions to the API bug/critical P0 include-changelog PR description should be included in next release changelog labels Jan 9, 2025
Copy link

github-actions bot commented Jan 9, 2025

♻️ PR Preview 95a9ca9 has been successfully destroyed since this PR has been closed.

🤖 By surge-preview

Copy link

github-actions bot commented Jan 9, 2025

E2E Test Results - DynamoDB Local - Local Block Adapter

13 passed

My original PR introduced an entirely wrong behaviour which is _also_ a
breaking change.  Fix this bad default.
@arielshaqed arielshaqed force-pushed the bug/squash-merge-should-not-be-default branch from 9ef4efe to 95a9ca9 Compare January 9, 2025 15:45
Copy link

github-actions bot commented Jan 9, 2025

E2E Test Results - Quickstart

11 passed

Copy link
Member

@N-o-Z N-o-Z left a comment

Choose a reason for hiding this comment

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

👍🏽

@@ -3826,27 +3826,33 @@ func TestController_MergeSquashing(t *testing.T) {

cases := []struct {
Name string
Squash bool
Squash *bool
Copy link
Member

Choose a reason for hiding this comment

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

I think adding a scenario where the parameter is not passed explicitly would have caught this.
Might want to add another flavor

Copy link
Contributor Author

@arielshaqed arielshaqed Jan 9, 2025

Choose a reason for hiding this comment

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

Great idea! That's exactly what "default" does here :-)

Copy link
Member

Choose a reason for hiding this comment

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

Missed that 😅

Copy link
Contributor Author

@arielshaqed arielshaqed left a comment

Choose a reason for hiding this comment

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

Thanks for the speedy review! Pulling, then releasing soon.

@@ -3826,27 +3826,33 @@ func TestController_MergeSquashing(t *testing.T) {

cases := []struct {
Name string
Squash bool
Squash *bool
Copy link
Contributor Author

@arielshaqed arielshaqed Jan 9, 2025

Choose a reason for hiding this comment

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

Great idea! That's exactly what "default" does here :-)

@arielshaqed
Copy link
Contributor Author

I suspect the Python HL wrapper Esti test is failing because of #8484. (It didn't catch this bug when I made it, in #8482, exactly because it doesn't run the current version!)

So force-pushing.

@arielshaqed arielshaqed merged commit 3c0e561 into master Jan 9, 2025
39 of 40 checks passed
@arielshaqed arielshaqed deleted the bug/squash-merge-should-not-be-default branch January 9, 2025 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/API Improvements or additions to the API bug/critical bug Something isn't working include-changelog PR description should be included in next release changelog P0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Squash merges is ON by default
2 participants