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

backporting: Fix pattern to handle commit subjects that begin with a space #25653

Merged
merged 1 commit into from Jun 26, 2023

Conversation

gentoo-root
Copy link
Contributor

Commit da04e68 (" bpf/nat: introduce snat_v*_handle_mapping() nat and rev_nat") has a subject that starts with a space, which results in this warning when trying to backport it:

 |  Warning: No commit correlation found!    via b968e9db2a58aaa9ad5e68a470d52bc2357a4f15 ("bpf/nat: introduce snat_v*_handle_mapping() nat and rev_nat")

Fix parsing so that it doesn't trim leading and trailing spaces from the commit subject.

…space

Commit da04e68 (" bpf/nat: introduce snat_v*_handle_mapping() nat and
rev_nat") has a subject that starts with a space, which results in this
warning when trying to backport it:

     |  Warning: No commit correlation found!    via b968e9d ("bpf/nat: introduce snat_v*_handle_mapping() nat and rev_nat")

Fix parsing so that it doesn't trim leading and trailing spaces from the
commit subject.

Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
@gentoo-root gentoo-root added the release-note/misc This PR makes changes that have no direct user impact. label May 24, 2023
@gentoo-root gentoo-root requested a review from a team as a code owner May 24, 2023 15:42
@gentoo-root gentoo-root requested a review from bimmlerd May 24, 2023 15:42
Copy link
Member

@bimmlerd bimmlerd left a comment

Choose a reason for hiding this comment

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

gotta love the shell - thanks for taking a look!

@github-actions
Copy link

This pull request has been automatically marked as stale because it
has not had recent activity. It will be closed if no further activity
occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label Jun 25, 2023
@gentoo-root gentoo-root added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. labels Jun 25, 2023
@gentoo-root
Copy link
Contributor Author

Marked as ready-to-merge, full CI is not needed, it's a change in backporting contrib scripts.

@borkmann borkmann merged commit 5d98b19 into cilium:main Jun 26, 2023
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants