Repository navigation
Commit 697789a
fix(fork): a fold keeps a split piece's repair line when its owner ends in (#N) (#1598)
## Problem
`fork:fold` tells a split piece from a squash-landed fixup by the trailing ` (#N)` on its subject.
A piece repeats its owner's subject, so an owner such as `fix(server): provider spawns drop another harness identity (#108)` makes its piece look landed.
The fold then lists the throwaway piece sha instead of the mover, and `fork:fold prove` refuses the member guard.
## Change
`memberLine` checks the repair line under `Squashes:` first:
| Fixup member | Renders as |
| --- | --- |
| carries a repair line | that repair line |
| no repair line, ` (#N)` marker | a landed member with its link |
| neither | refused, as before |
## Scope and approval
Found while splitting movers for #1493, batch B8; the #1591 change introduced the marker test.
## Verification
| Check | Result |
| --- | --- |
| `vp test run scripts/fork-fold.test.ts` | exit 0, 35 tests |
| new case without the fix | fails |
| `vp lint`, `vp fmt --check` on both files | exit 0, exit 0 |
| `vp run fork:ci` | exit 0 |
Claude Opus 5.5, Claude Code.
## Fork trailers
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>1 parent 3831e40 commit 697789a
2 files changed
Lines changed: 23 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
231 | 247 | | |
232 | 248 | | |
233 | 249 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
324 | 324 | | |
325 | 325 | | |
326 | 326 | | |
327 | | - | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
328 | 331 | | |
329 | 332 | | |
330 | 333 | | |
| |||
343 | 346 | | |
344 | 347 | | |
345 | 348 | | |
346 | | - | |
| 349 | + | |
347 | 350 | | |
348 | | - | |
| 351 | + | |
| 352 | + | |
349 | 353 | | |
350 | 354 | | |
351 | 355 | | |
352 | 356 | | |
353 | | - | |
354 | 357 | | |
355 | 358 | | |
356 | 359 | | |
| |||
0 commit comments