Repository navigation
Commit 3831e40
fix(fork): folds list squash-landed fixups as members (#1591)
## Problem
`fork:fold apply` refuses any `fixup!` member without a repair line under `Squashes:`, so it cannot fold the 48 `fixup! <owner> (#N)` commits the #1493 pay-down squash-landed on `hyprws`.
The sync's own fold places them as `fixup`, which discards each message, so it drops all 48 pull request links; `fork:fold prove` reports `link guard → 48 finding(s)` on that tip.
## Change
`memberLine` treats a `fixup!` subject that carries a squash ` (#N)` marker as a landing of its own: it renders as an ordinary member line, so the fold lists its sha and keeps its link.
A `fixup!` with neither a repair line nor a squash marker still refuses.
## Scope and approval
Part of the authorized #1493 pay-down; keeps the #1491 rule that no fold drops a pull request link.
## Verification
| Check | Result |
| --- | --- |
| `vp test run scripts/fork-fold.test.ts` | 34 passed, including a new squash-landed fixup case |
| `fork:fold apply` of a plan joining each fixup to its owner, on `cf2b4926cba` | 200 commits → 152 |
| `fork:fold prove origin/hyprws <fold>` | member guard 0, link guard 0, tree-equal, delta and scan exit 0 |
| `vp run fork:ci` | exit 0 |
Claude Opus 5.5 in Claude Code.
## Fork trailers
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>1 parent ca00d62 commit 3831e40
2 files changed
Lines changed: 26 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
213 | 231 | | |
214 | 232 | | |
215 | 233 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
322 | 322 | | |
323 | 323 | | |
324 | 324 | | |
325 | | - | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
326 | 329 | | |
327 | 330 | | |
328 | 331 | | |
| |||
335 | 338 | | |
336 | 339 | | |
337 | 340 | | |
338 | | - | |
339 | | - | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
340 | 344 | | |
341 | 345 | | |
342 | | - | |
| 346 | + | |
343 | 347 | | |
344 | 348 | | |
345 | 349 | | |
| |||
0 commit comments