You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit ae15e93
Browse filesBrowse the repository at this point in the historyBrowse files
fix(fork): a sync fold keeps the squash-landed fixup's PR link (#1620)
> 🤖 claude/anthropic claude-opus-5-5 (high)
## Problem
The sync rebase folds a squash-landed `fixup! <owner subject> (#N)` into its owner as git's `fixup`, which keeps only the owner's message.
So `(#N)` is lost, breaking the #1491 rule that every PR link survives every fold.
## Change
1. Sync renders each folded owner's message first
2. Adds the `Squashes:` list `fork:fold` writes
3. Lists each fixup's PR link there
4. Keeps trailers verbatim, `Co-authored-by:` too
5. Sequence editor amends the owner with it
6. Link guard refuses a tip that lost a link
A fixup citing no PR still folds as plain git `fixup`, its owner's message untouched.
`fork-sync.md` now names this as the sync's only reword.
**Guard scope:** it also refuses a sync where git silently drops a linked fork commit.
That matches the sync's rule that it never drops a commit.
## Scope and approval
Closes#1592.
- [ ] **Sync:** a folded `fixup! <subject> (#N)` keeps RSI-Software/t3code-hyprws#N on the owner's message
- [ ] **Guard:** the sync refuses a rebased tip that drops a PR link
## Verification
| test | result |
| --- | --- |
| Fold of `fixup! … (#1600)` | link kept as member line, trailers verbatim |
| Tip with the link dropped | refused |
| Real rebased tip | passes the guard |
| command | exit |
| --- | --- |
| `vp test run`, 3 touched test files, 127 tests | 0 |
| scripts `tsc --noEmit` | 0 |
| `vp run fork:ci`, scripts 739 tests | 0 |
Not run: a real sync with a linked fixup on trunk; the next one proves it.
Claude Opus 5.5 in Claude Code, inside T3 Code; implemented by a Pi child agent.
## Fork trailers
Squashes:
- d33a265 fix(fork): a sync fold keeps the squash-landed fixup's PR link (#1620) (#1620)
- a42e986 fixup! fix(fork): a sync fold keeps the squash-landed fixup's PR link (#1620) (#1620)
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no
Copy file name to clipboardExpand all lines: docs/fork/operations/fork-sync.md
+3-1Lines changed: 3 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -9,8 +9,10 @@ Discipline lives in [Fork development](../internals/fork-development.md); the pr
9
9
10
10
`hyprws` is the single fork trunk.
11
11
The sync driver runs one upstream release tag end to end: one run, one exit code, one report.
12
-
It never merges upstream in, nor drops, reorders, or rewords a commit.
12
+
It never merges upstream in, nor dropsor reorders a commit.
13
13
It folds each `fixup! <subject>` landing into the one fork commit it names, a squash landing's trailing ` (#N)` included, and refuses a fixup naming none or several.
14
+
It rewords only an owner that absorbs a squash-landed fixup: the fixup's PR link joins its `Squashes:` list, rendered the way fork:fold renders one.
15
+
The rebase refuses a rebased tip that dropped any PR link.
0 commit comments