Skip to content

fix(git,fork): drop four divergences upstream has healed; revert log marker - #150

Merged
kylehgc merged 1 commit into
developfrom
heal/upstream-fixed-claims
Sep 1, 2026
Merged

kylehgc merged 1 commit into
developfrom
heal/upstream-fixed-claims

Conversation

@kylehgc

@kylehgc kylehgc commented Sep 1, 2026

Copy link
Copy Markdown
Owner

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 proof has been red since 2026-08-31 (runs 31994696860, 32690336139, 33357472129). Its verdict:

- init_dry_run_tolerates_bom_prefixed_settings_json: PASSES ON UPSTREAM — upstream has fixed this. Drop the claim and the fork divergence.
- tsc_pipe_filter_compresses_real_pretty_diagnostics: PASSES ON UPSTREAM — upstream has fixed this. Drop the claim and the fork divergence.
- git_log_patch_preserves_diff_hunks: PASSES ON UPSTREAM — upstream has fixed this. Drop the claim and the fork divergence.
- git_log_stat_keeps_every_commit: PASSES ON UPSTREAM — upstream has fixed this. Drop the claim and the fork divergence.

Per CONTEXT.md, a fork fix upstream has solved its own way is a duplicate: upstream wins.

What upstream has, per claim

Claim Fork commit(s) Upstream equivalent Code change here
BOM-prefixed settings.json 4e1ae5c strip_leading_bom in core/utils.rs, called at every init.rs read site none — git diff upstream/develop already shows no fork-only BOM code
tsc --pretty diagnostics a7998ad (xiaozh) TSC_PRETTY_ERROR + strip_ansi in tsc_cmd.rs; production file byte-identical none — fork-only savings test kept
git log -p keeps hunks d88c1f4 (kingpy-bot) ca89767: requests_raw_log_output → run_passthrough for -p/--stat/--numstat/--name-*/--raw/… reverted the fork's COMMIT_MARKER leading-marker change in run_log / filter_log_output and its tests back to upstream's ---END---
git log --stat keeps every commit 791359c (georgyia) same ca89767 same revert

With 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

Bookkeeping

  • Four rows removed from .github/fork-claims.tsv and listed under a "Healed 2026-09-01" comment block with the upstream commits (55cbce2 BOM, 9d1c60a tsc, 0baf07e / ca89767 git log).
  • 4e1ae5c, a7998ad, 791359c added to HEALED_SHAS in scripts/fork-delta.sh (d88c1f4 is already excluded by the patch-id scan: it is byte-identical to upstream 0baf07e).
  • .github/README.md delta regenerated: 61 → 58 fixes (exactly the three rows the delta listed for these).
  • Doc comments in the three kept proof tests updated so they no longer describe upstream as still broken.

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 d88c1f4 entry, healed-block comment. Noted, not acted on:

  • Upstream's requests_raw_diff_shape has a residual gap: --stat-width=, --stat-count=, --compact-summary, --dirstat-by-file, --cumulative, -c, --cc, -U<n>, --binary, --remerge-diff still emit a diffstat/patch yet fall to the compact path. That is upstream's bug to extend upstream; resurrecting COMMIT_MARKER for it would reintroduce the divergence the proof says is healed. --stat and -p themselves are routed raw.
  • Branch claude/adoring-sanderson-2edc9e (pushed, no PR) holds an earlier docs-only attempt at the same healing on pre-sync develop, including a hand-edited proof table. This PR supersedes it; it can be deleted.

Quality gate

x64 host toolchain: cargo fmt --all clean · cargo clippy --all-targets 0 warnings · cargo test --all 3083 unit tests passed, 0 failed, 8 ignored; all integration suites green, including git_log_patch_preserves_diff_hunks and git_log_stat_keeps_every_commit now running through upstream's raw-log path.

The proof table block in .github/README.md is regenerated by the Fork proof workflow (Linux-only), not by hand; it will be dispatched after merge and should turn green with the four rows gone.

🤖 Generated with Claude Code

…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>
@kylehgc
kylehgc merged commit 0bcab8e into develop Sep 1, 2026
3 checks passed
@kylehgc
kylehgc deleted the heal/upstream-fixed-claims branch September 1, 2026 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant