-
Notifications
You must be signed in to change notification settings - Fork 362
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
Conversation
♻️ PR Preview 95a9ca9 has been successfully destroyed since this PR has been closed. 🤖 By surge-preview |
My original PR introduced an entirely wrong behaviour which is _also_ a breaking change. Fix this bad default.
9ef4efe
to
95a9ca9
Compare
There was a problem hiding this 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 |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missed that 😅
There was a problem hiding this 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 |
There was a problem hiding this comment.
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 :-)
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. |
My original PR introduced an entirely wrong behaviour which is also a breaking change. Fix this bad default.
Closes #8482.