Repository navigation
fix(git,fork): drop four divergences upstream has healed; revert log marker - #150
Merged
Merged
Conversation
…marker Fork-proof has been red since 2026-08-31: four claims pass on upstream. Upstream merged equivalent fixes (55cbce2 BOM, 9d1c60a tsc pretty, 0baf07e git log -p, ca89767 raw routing for every diff-shaped log flag), so per CONTEXT.md the fork's versions are duplicates and go. Code: revert the COMMIT_MARKER leading-marker change in run_log / filter_log_output (791359c, d88c1f4) back to upstream's ---END--- form; with ca89767 a diffstat can no longer reach filter_log_output. BOM and tsc need no code change: the fork's production code already matches upstream. Machine-output passthrough and append_add_pathspecs stay. Bookkeeping: four claim rows dropped and recorded as healed in fork-claims.tsv; 4e1ae5c / a7998ad / 791359c added to HEALED_SHAS (d88c1f4 is byte-identical to upstream 0baf07e, caught by patch-id); delta regenerated 61 -> 58; proof-test doc comments updated. The proof table block is regenerated by the Fork proof workflow. Known residual upstream gap, deliberately not patched here: flags such as --stat-width=, --compact-summary, -U<n>, --binary still miss requests_raw_diff_shape and fall to the compact log path. Gate: fmt clean, clippy 0 warnings, cargo test --all 3083 passed / 0 failed. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Drops four fork divergences that upstream has since fixed its own way, so the fork-proof workflow goes green again and the landing page stops claiming credit for them.
Why
Fork proofhas been red since 2026-08-31 (runs 31994696860, 32690336139, 33357472129). Its verdict:Per CONTEXT.md, a fork fix upstream has solved its own way is a duplicate: upstream wins.
What upstream has, per claim
settings.json4e1ae5cstrip_leading_bomincore/utils.rs, called at everyinit.rsread sitegit diff upstream/developalready shows no fork-only BOM code--prettydiagnosticsa7998ad(xiaozh)TSC_PRETTY_ERROR+strip_ansiintsc_cmd.rs; production file byte-identicalgit log -pkeeps hunksd88c1f4(kingpy-bot)ca89767:requests_raw_log_output→run_passthroughfor-p/--stat/--numstat/--name-*/--raw/…COMMIT_MARKERleading-marker change inrun_log/filter_log_outputand its tests back to upstream's---END---git log --statkeeps every commit791359c(georgyia)ca89767With upstream's raw routing a diffstat or patch can no longer reach
filter_log_output, so the leading marker guarded an unreachable path.Kept on purpose
log_args_request_machine_output/diff_args_request_machine_output/status_args_request_machine_outputandappend_add_pathspecsingit.rs(upstream fix(git): keep machine output raw rtk-ai/rtk#2573 open;yadm <subcommand>is rewritten tortk git, so yadm commands act on the current project repo instead of the dotfiles repo — and baregit addbecomesgit add .rtk-ai/rtk#3408) — untouched.Bookkeeping
.github/fork-claims.tsvand listed under a "Healed 2026-09-01" comment block with the upstream commits (55cbce2BOM,9d1c60atsc,0baf07e/ca89767git log).4e1ae5c,a7998ad,791359cadded toHEALED_SHASinscripts/fork-delta.sh(d88c1f4is already excluded by the patch-id scan: it is byte-identical to upstream0baf07e)..github/README.mddelta regenerated: 61 → 58 fixes (exactly the three rows the delta listed for these).Review round
Independent reviewer pass: revert clean (no marker remnants, every remaining git.rs hunk is a kept addition), claims file conventions intact. Acted on: stale test prose, redundant
d88c1f4entry, healed-block comment. Noted, not acted on:requests_raw_diff_shapehas a residual gap:--stat-width=,--stat-count=,--compact-summary,--dirstat-by-file,--cumulative,-c,--cc,-U<n>,--binary,--remerge-diffstill emit a diffstat/patch yet fall to the compact path. That is upstream's bug to extend upstream; resurrectingCOMMIT_MARKERfor it would reintroduce the divergence the proof says is healed.--statand-pthemselves are routed raw.claude/adoring-sanderson-2edc9e(pushed, no PR) holds an earlier docs-only attempt at the same healing on pre-syncdevelop, including a hand-edited proof table. This PR supersedes it; it can be deleted.Quality gate
x64 host toolchain:
cargo fmt --allclean ·cargo clippy --all-targets0 warnings ·cargo test --all3083 unit tests passed, 0 failed, 8 ignored; all integration suites green, includinggit_log_patch_preserves_diff_hunksandgit_log_stat_keeps_every_commitnow running through upstream's raw-log path.The proof table block in
.github/README.mdis regenerated by theFork proofworkflow (Linux-only), not by hand; it will be dispatched after merge and should turn green with the four rows gone.🤖 Generated with Claude Code