Allow remediation commits for DCO #5931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Colin James <colin.barr@cloud.com>
last-genius
approved these changes
Aug 13, 2024
edwintorok
approved these changes
Aug 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change would allow commits to retroactively sign off ("remediate") commits that are already in
master, without rewriting history. Ideally, no commit would get intomasterwithout being signed off. However, we have found that it is possible for the DCO bot to confuse the author's chosen sign-off name + email combination with the name + email combination that GitHub creates on the author's behalf when producing a merge commit. Since the DCO bot doesn't only compare by email, it believes there is a discrepancy and sets the DCO to fail.