Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
60e8da1
fix: waive mismatched sign-off for the remaining v5 odttlnt commits
hivecommons-hive[bot] Oct 29, 2026
d10bb25
fix: document each waived v5 SHA on its own rationale line
hivecommons-hive[bot] Oct 29, 2026
22bba54
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
7c67ed5
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
e6e406d
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
182b60d
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
c892a64
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
cc0e81b
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
c2cf307
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
a7a1f48
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
2dbd28e
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
a9ad366
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
c88aaa9
ci: refresh checks after concurrency-cancelled squash-attribution runs
hivecommons-hive[bot] Oct 30, 2026
25c8121
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
1fb300c
ci: retrigger image build after transient registry-mirror blob miss
hivecommons-hive[bot] Oct 30, 2026
222dec8
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
a241a2a
πŸ“– docs: note that squash sign-off waivers are historical-only
hivecommons-hive[bot] Oct 30, 2026
0dd9ff8
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
232f57d
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
75b341d
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
9fcf115
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
79a34dc
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
0c07159
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
34208c8
docs: reword CONTRIBUTING waiver note to match checker behaviour
hivecommons-hive[bot] Oct 30, 2026
fd91041
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
a24d54f
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
c711871
Merge branch 'v5' into scanner/fix-15542
hivecommons-hive[bot] Oct 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .github/workflows/dco-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,21 @@ env:
# disposition. Expect STALE-WAIVER once the contributor's next commit lands
# under the work address; remove the entry then.

# 003144299b952e53290088e7637ac12f6d5d20e9 β€” v5 squash with the same
# mismatched-signoff shape and the same person as 687c3cb0 above: author
# Sachin Naik <91499691+odttlnt@users.noreply.github.com>, sign-off
# sachin.naik@ibm.com. Reported by the monitor in #15542. Protected v5
# history cannot be re-signed in place and no sign-off is added on the
# contributor's behalf, so it is waived per commit. Accepted by maintainer
# disposition in #15542: the maintainer merging the PR that adds this entry
# IS that disposition. Reversible: remove the entry.

# 8eb7267d3302bb3f68e718f4caf57826efb88ae3 β€” same shape, person and
# disposition as 003144299b above (#15542). Reversible: remove the entry.

# 3fedd0f3cbf5703a306157411a7136ecff738f5c β€” same shape, person and
# disposition as 003144299b above (#15542). Reversible: remove the entry.

# KNOWN FAILING COMMITS THAT ARE DELIBERATELY *NOT* WAIVED
#
# Deep history carries further genuine mismatches β€” 8b536911 and, on v5
Expand All @@ -319,7 +334,7 @@ env:
# regression. They are intentionally left unwaived: pre-approving them would
# grow this list for commits that are not actually being reported, which is
# the exact failure mode #6770 was filed about.
DCO_WAIVED_COMMITS: 'b798382a4d98ada28b0cb813644a595db0c58b08 7e01fee4a2c1a37f4a4072bf2d17e76e27113d01 d8f376e8e95f7b0c7d48d2b05b3a2a07ac9ee69b 4b9261183378a1a02a921cd0cc9df31e6f37993b 01bd2469e7a4022fff3fc04c42226c4d90c2f410 e29343efbb6e0721ca665ed8bd587d08997325e2 a8104b0cbeee1c4ac41034ac3f9951e6b5ac1200 692d068ffa198895ab91bd7ad663971f2b8ad358 b893b01c90e6ffff951523d20b19e9dfbfa80184 a0de3f920ded7e0cfc287bb5009d542e5a14f014 c6c78c3a26c33c6d1530996df20ead0a6b699dda a9200f3d278fcdbf6291f37f921845113814686e fb153585e6dab7b6f6808cb328e706d691f9be79 00070300002c88fda6850278edaea2498e8ca941 511027d8174be02b1dd77c25e9f8d5265f7fb7d4 687c3cb006d7559135f5f2fb0db13476d1af2a43'
DCO_WAIVED_COMMITS: 'b798382a4d98ada28b0cb813644a595db0c58b08 7e01fee4a2c1a37f4a4072bf2d17e76e27113d01 d8f376e8e95f7b0c7d48d2b05b3a2a07ac9ee69b 4b9261183378a1a02a921cd0cc9df31e6f37993b 01bd2469e7a4022fff3fc04c42226c4d90c2f410 e29343efbb6e0721ca665ed8bd587d08997325e2 a8104b0cbeee1c4ac41034ac3f9951e6b5ac1200 692d068ffa198895ab91bd7ad663971f2b8ad358 b893b01c90e6ffff951523d20b19e9dfbfa80184 a0de3f920ded7e0cfc287bb5009d542e5a14f014 c6c78c3a26c33c6d1530996df20ead0a6b699dda a9200f3d278fcdbf6291f37f921845113814686e fb153585e6dab7b6f6808cb328e706d691f9be79 00070300002c88fda6850278edaea2498e8ca941 511027d8174be02b1dd77c25e9f8d5265f7fb7d4 687c3cb006d7559135f5f2fb0db13476d1af2a43 003144299b952e53290088e7637ac12f6d5d20e9 8eb7267d3302bb3f68e718f4caf57826efb88ae3 3fedd0f3cbf5703a306157411a7136ecff738f5c'
# Tide/tagged-release failures discussed in #6276 came from human squash
# commits and release metadata, not bot-authored commits. Skip bots here so
# release automation is not paged for bracketed bot-address edge cases that
Expand Down
12 changes: 12 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,18 @@ rewritten; their failures are resolved by maintainer disposition, not by you.
blast radius β€” are documented in
[`src/docs/v5-sync-policy.md`](src/docs/v5-sync-policy.md#inherited-dco-failures-from-v4).

**Note on waivers:** Per-SHA waivers in `DCO_WAIVED_COMMITS` cover squash
commits whose author/sign-off mismatch the checkers cannot resolve on their
own β€” typically a noreply author paired with a real sign-off address that
has no same-person evidence in the protected branch's history yet (see the
next paragraph). The "Sign-off survives the squash" pre-merge check
(`.github/workflows/dco-squash-attribution.yml`, running
`src/scripts/check-squash-signoff-attribution.sh`) catches every other kind
of mismatch at PR time. If your PR fails that check, fix your sign-off by
re-signing your branch commits (`git commit --amend -s`), not by seeking a
waiver; waivers are a maintainer disposition for already-landed commits, not
a way around the pre-merge gate.

One identity shape the post-merge check resolves on its own: GitHub's squash
writes the pull-request author's GitHub identity on the landing commit, so a
contributor with a private email lands as
Expand Down
Loading