Skip to content

ci: allow DCO remediation commits - #145

Merged
farhadrgh merged 1 commit into
mainfrom
farhadr/dco-remediation-config
Sep 17, 2026
Merged

farhadrgh merged 1 commit into
mainfrom
farhadr/dco-remediation-config

Conversation

@farhadrgh

Copy link
Copy Markdown
Collaborator

Summary

Enables DCO remediation commits, so a branch with unsigned commits can be fixed by adding a commit rather than rewriting history.

allowRemediationCommits:
  individual: true
  thirdParty: true

Why

CONTRIBUTING.md requires a Signed-off-by trailer on every commit and the DCO app enforces it on PRs. Today the only remedy for a branch with unsigned commits is to rewrite its history.

That is a bad trade on a long-lived branch. PR #137 (farhadr/2d_bench) has 43 commits and 5 merge commits; rebasing it to add trailers would:

  • flatten those merge commits,
  • replay the 21-file conflict resolution from the v0.2.0 sync, and
  • change the SHA of a commit authored by someone else.

Remediation adds one commit instead. thirdParty is needed whenever a branch carries commits from more than one author — the common case for any shared feature branch.

Formats

The app matches these exactly (from lib/dco.js):

I, Full Name <email>, hereby add my Signed-off-by to this commit: <sha>

On behalf of Author <author@email>, I, Signer <signer@email>, hereby add my Signed-off-by to this commit: <sha>

One line per commit, in the body of a commit that is itself signed off.

Note on third-party sign-off

This is a real DCO certification about provenance, not a formality. It should only be used where the signer can actually make that certification about the code in question.

Ordering

The app reads this file from the default branch (probot context.config), not from the pull request — so it must land on main before any remediation commit is accepted.

Test plan

  • YAML parses; keys match the app's documented defaults (allowRemediationCommits.individual / .thirdParty).
  • pre-commit clean.
  • After merge: push the remediation commit to Mixer Benchmarks #137 and confirm its DCO check goes green.

🤖 Generated with Claude Code

CONTRIBUTING.md requires a Signed-off-by trailer on every commit, and the DCO
app enforces it on pull requests. Until now the only way to fix a branch with
unsigned commits was to rewrite its history.

That is a bad trade on a long-lived branch. farhadr/2d_bench (PR #137) has 43
commits and 5 merge commits; rebasing it to add trailers would flatten those
merges, replay the 21-file conflict resolution from the v0.2.0 sync, and change
the SHA of a commit authored by someone else.

Remediation commits solve it by ADDING a commit rather than rewriting:

  individual  — the author signs off their own earlier commit
  thirdParty  — someone signs off on the author's behalf

Both are enabled. thirdParty is required whenever a branch carries commits from
more than one author, which is the common case for any shared feature branch.

Third-party sign-off is a genuine DCO certification about provenance, not a
formality — it should only be used where the signer can actually make that
certification about the code in question.

Note the app reads this file from the DEFAULT branch (probot `context.config`),
not from the pull request, so it has to land on main before any remediation
commit will be accepted.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: Farhad Ramezanghorbani <farhadr@nvidia.com>
@coderabbitai

coderabbitai Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: e0b0d5fd-8400-4c56-adaf-f6215666c624

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@farhadrgh
farhadrgh merged commit 9466160 into main Sep 17, 2026
8 checks passed
@farhadrgh
farhadrgh deleted the farhadr/dco-remediation-config branch September 17, 2026 17:31
farhadrgh added a commit that referenced this pull request Sep 17, 2026
Adds DCO sign-off for the commits on this branch that predate the local
prepare-commit-msg hook, using remediation lines rather than a rebase.
Rewriting would flatten this branch's merge commits, replay the 21-file
conflict resolution from the v0.2.0 sync, and change another author's SHA.
Enabled by allowRemediationCommits in .github/dco.yml (PR #145).

Most of these are not multi-author commits: all but one of the
On-behalf-of lines are my own work committed under a different email,
because user.email was unset on the ptyche login nodes (git fell back to
the hostname) and because web-UI merges use the noreply address. The DCO
app matches name and email exactly, so those still need the third-party
form. One is a genuine third-party sign-off, for Alireza's ee5146e.

I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 607b7e6
I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: b57c982
On behalf of Alireza Moradzadeh <amoradzadeh@nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: ee5146e
I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 53add4d
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 8d55ceb
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: f49beca
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 7854586
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 2815ef2
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 7c62e5e
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: c0f15e2
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: c5dc391
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 933875f
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: b5a3533
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche01.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 742ebcb
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche01.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 7b92df9
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 587f1e2
On behalf of Farhad Ramezanghorbani <farhadr@login-ptyche02.ptyche.clusters.nvidia.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 0856742
On behalf of Farhad Ramezanghorbani <farhadrgh@users.noreply.github.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 3a29bdd
On behalf of Farhad Ramezanghorbani <farhadrgh@users.noreply.github.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: fc734b3
On behalf of Farhad Ramezanghorbani <farhadrgh@users.noreply.github.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: b96fc5d
On behalf of Farhad Ramezanghorbani <farhadrgh@users.noreply.github.com>, I, Farhad Ramezanghorbani <farhadr@nvidia.com>, hereby add my Signed-off-by to this commit: 32ab1e6

Signed-off-by: Farhad Ramezanghorbani <farhadr@nvidia.com>
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.

1 participant