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 53c1d1a
Browse filesBrowse the repository at this point in the historyBrowse files
fix(fork-sync): hook guard, hook re-apply, and fold check each drop a manual repair (#1782)
* fix(fork-sync): hook guard, hook re-apply, and fold check each drop a manual repair
The guard reads markers from the committed file, re-apply shifts a hook with its re-indented anchor, and a stopped fold names the commit to retarget to.
Fork-Domain: fork-meta
Fork-Tier: bugfix
Fork-Upstreamable: no
* fix(fork-sync): type the hook guard input once; trust committed spans, template literals, and unterminated lines
Fork-Domain: fork-meta
Fork-Tier: bugfix
Fork-Upstreamable: no
* fix(fork-sync): any backtick or line continuation keeps a multi-line hook verbatim
Squashes:
- 73d431d fix(fork-sync): hook guard, hook re-apply, and fold check each drop a manual repair (#1782) (#1782)
- 2750cd1 fixup! fix(fork-sync): hook guard, hook re-apply, and fold check each drop a manual repair (#1782) (#1782)
Fork-Domain: fork-meta
Fork-Tier: bugfix
Fork-Upstreamable: no
// The hint is advisory; the refusal stands without it.
214
+
}
157
215
constreason=
158
216
pair===undefined
159
217
? stoppedSha===""
160
218
? "the replay failed before applying a commit"
161
219
: `the replay stopped at ${name(stoppedSha)}`
162
-
: `fixup "${subjectOf(pair[0])}" (${shortSha(pair[0])}) does not fold into its owner "${subjectOf(pair[1])}" (${shortSha(pair[1])}): the replay stopped applying it there`;
220
+
: `fixup "${subjectOf(pair[0])}" (${shortSha(pair[0])}) does not fold into its owner "${subjectOf(pair[1])}" (${shortSha(pair[1])}): the replay stopped applying it there`+
221
+
(retarget===undefined
222
+
? ""
223
+
: `; name "${subjectOf(retarget)}" (${shortSha(retarget)}) instead, the newest commit that changed the lines around this edit`);
0 commit comments