Skip to content

Conversation

@kolyshkin
Copy link
Collaborator

As map lookup returns nil if no key is found, and append will create a new slice if it's first argument is nil, we can greatly simplify the loop, as suggested in 1.

Copy link
Collaborator

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@Luap99 Luap99 enabled auto-merge (rebase) January 20, 2026 10:39
As map lookup returns nil if no key is found, and append will create a
new slice if it's first argument is nil, we can greatly simplify the
loop, as suggested in [1].

[1]: coreos#448 (comment)

Reported-by: Paul Holzinger <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
@Luap99 Luap99 merged commit 27f6bea into coreos:main Jan 20, 2026
20 checks passed
@Luap99
Copy link
Collaborator

Luap99 commented Jan 20, 2026

@kolyshkin Did you only enabled rebase merges only and no longer the ones with merge commits?
Do we really need to force rebases all the time? Seems like low risk that something breaks because of that but I guess CI is fast enough here that the extra rebases don't matter much so I am fine with doing that if that was your intention.

@kolyshkin kolyshkin deleted the simp branch January 27, 2026 20:03
@kolyshkin
Copy link
Collaborator Author

@kolyshkin Did you only enabled rebase merges only and no longer the ones with merge commits? Do we really need to force rebases all the time? Seems like low risk that something breaks because of that but I guess CI is fast enough here that the extra rebases don't matter much so I am fine with doing that if that was your intention.

I had this option enabled in branch protection rules:

[ ] Require branches to be up to date before merging

This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

but I've disabled it now. While in other repos I've seen a few cases where a PR caused a bug which was not caught before merging because of another recently merged PR, such cases are rare and we catch them anyway after the merge (and can do a quick fix), so it's probably not worth the hassle here.

@kolyshkin kolyshkin added this to the v22.7.0 milestone Jan 28, 2026
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