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

Git-ignore drop-privileges along with other binaries #2038

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

christian-2
Copy link
Contributor

As agreed in PR #2031. W/o corresponding issue, because change is minor.

@christian-2 christian-2 requested a review from a team as a code owner January 29, 2024 13:00
Copy link
Contributor

@kevsecurity kevsecurity left a comment

Choose a reason for hiding this comment

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

LGTM

@kevsecurity kevsecurity added the release-note/misc This PR makes changes that have no direct user impact. label Jan 29, 2024
@kevsecurity
Copy link
Contributor

I think to fix the checkpatch test you might need to create a new branch from the up to date main and cherry-pick your first commit, and submit that. I think the second commit (the merge) is upsetting the check.

@christian-2
Copy link
Contributor Author

@kevsecurity okay, will do.

@willfindlay
Copy link
Contributor

@christian-2 equivalent but perhaps easier for you: git rebase -i origin/main and simply drop the merge commit.

As agreed in PR cilium#2031

Signed-off-by: Christian Hörtnagl <christian2@univie.ac.at>
@christian-2
Copy link
Contributor Author

@kevsecurity Should be fixed now. @willfindlay FYI what appears to have worked for me in the end was git rebase -i ..., git push origin fixes-gitignore --force-with-lease as suggested by @mtardy in #2031.

Copy link
Member

@mtardy mtardy left a comment

Choose a reason for hiding this comment

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

Thanks!

@mtardy mtardy merged commit 21f3173 into cilium:main Jan 31, 2024
29 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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

4 participants