Repository navigation
Commit a1c4ebc
fix(fork-sync): a landed hook retirement exempts no later sync (#1892)
## Problem
The #1891 hook gate exempts any key with a `Fork-Hook-Retired` trailer above the merge base.
A rebased tip copies every landed fork commit, so a trailer that landed on a plain commit exempts its key in every later sync.
## Change
- **Exempt only new trailers:** the tip must carry more per key than the trunk
- **Landed trailers:** cancel against their rebased copies
## Scope and approval
Found while auditing the #1886 proof run's 36 retirements.
Refs #1886
## Verification
- `fork-sync.test.ts`: a landed trailer's rebased copy no longer exempts the key
- Fails before the fix, passes after (80/80)
- `vp run fork:ci` → exit 0
Claude Opus 5.5 via Claude Code.
## Fork trailers
Squashes:
- b9d7679 fix(fork-sync): a landed hook retirement exempts no later sync (#1892) (#1892)
- 7ba75a7 fixup! fix(fork-sync): a landed hook retirement exempts no later sync (#1892) (#1892)
Fork-Domain: fork-meta
Fork-Tier: bugfix
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>1 parent 7f8dad0 commit a1c4ebc
2 files changed
Lines changed: 27 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
646 | 646 | | |
647 | 647 | | |
648 | 648 | | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
649 | 658 | | |
650 | 659 | | |
651 | 660 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1155 | 1155 | | |
1156 | 1156 | | |
1157 | 1157 | | |
1158 | | - | |
1159 | | - | |
1160 | | - | |
1161 | | - | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
1162 | 1162 | | |
1163 | 1163 | | |
1164 | 1164 | | |
| |||
1169 | 1169 | | |
1170 | 1170 | | |
1171 | 1171 | | |
1172 | | - | |
1173 | | - | |
1174 | | - | |
1175 | | - | |
1176 | | - | |
1177 | | - | |
1178 | | - | |
1179 | | - | |
1180 | | - | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
1181 | 1185 | | |
1182 | | - | |
| 1186 | + | |
1183 | 1187 | | |
1184 | 1188 | | |
1185 | 1189 | | |
| |||
0 commit comments