mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-04 00:20:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix-rewrite: drop ledger force-add from restruct_cycle after history rewrite (D1)

Browse Source
This commit is contained in:
Drew T
2026-10-02 23:41:19 -06:00
parent fac631b1d7
commit e63ef6b54f
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phase-ends/current/discussions/INDEX.md
+1
View File
@@ -1,2 +1,3 @@
# Discussions -- one line per record
# id | topic | date | status | path
D1 | cant push: 100MB+ .run ledger/census blobs in unpushed commits | 2026-10-02 | open | phase-ends/current/discussions/D1.md
phase-ends/current/logs/FIX-rewrite.md
+11
View File
@@ -0,0 +1,11 @@
# FIX-rewrite — drop >100MB blobs from unpushed range (D1, developer-approved 2026-10-02)
- Before: HEAD 09847283bd; origin/main..main = 220 commits; >100MB blobs: 109x `.run/P37/restruct/ledger.jsonl`, 1x `.run/P39/census/cache/walk_cache.json`, 1x `.run/P39/census/sites.jsonl`. Nothing else >100MB.
- Backup: `.run/keep/p37-ledger.jsonl` (295916518 B, sha256 3e0e5cc5…12b8 == working); `.run/keep/p39-census/` (1505576713 B) + `.run/keep/census.sha`.
- Stashed dirty `phase-ends/current/discussions/INDEX.md` (filter-branch needs clean tree); popped after. Untracked `.claude/agents/expert-fable-5m.md` untouched.
- Rewrite: `FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --index-filter 'git rm -r -q --cached --ignore-unmatch .run/P37/restruct/ledger.jsonl .run/P39/census' -- origin/main..main` via run.sh bg (`.run/logs/filter-rewrite.log`), exit 0, ~12 s, 220/220 rewritten.
- After: HEAD fac631b1d7 (pre-fix-commit); origin/main..main = 220; blobs >100MB in range = 0; largest blob now `.run/P36/delever/ledger.jsonl` 80972738 B (open item D1: untrack later).
- Tree check: `git diff --name-only old new` = only `.run/P37/restruct/ledger.jsonl` (census was not in old HEAD tree); HEAD:src 5c9132a952 and HEAD:docs e230d86dd8 identical before/after.
- Restore: ledger copied back, sha256 identical; census on disk unchanged (sha list diff empty). Both `git check-ignore`d.
- `refs/original/refs/heads/main` deleted (old main still in reflog; no gc run).
- Keep-out: `tools/restruct_cycle.sh:100` force-add replaced by DISABLED comment; `bash -n` ok; grep found no other `git add -f .run` in tools/.
- Push: developer runs `git push`.
tools/restruct_cycle.sh
+3 -1
View File
@@ -97,7 +97,9 @@ PYEOF
sleep 10
done
git add -A src && git add .run/P37/restruct .run/P37/census .run/P37/baseline $([ -f phase-ends/CURRENT_PHASE.md ] && echo phase-ends/CURRENT_PHASE.md) docs/readability.md docs/readability-progress.tsv 2>/dev/null; git add .run/P36/delever/calibration.json 2>/dev/null
git add -f .run/P37/restruct/ledger.jsonl || exit 1 # tracked under the ignored .run/: the plain add above exits 1 on the ignored dir (T4.c2)
# DISABLED: force-add of .run/P37/restruct/ledger.jsonl — 2026-10-02, FIX-rewrite (D1)
# Original intent: track the ledger under the ignored .run/ (T4.c2). Why disabled: 109 >100MB versions blocked push;
# history rewritten to drop it. Re-enable if: never; the ledger stays an untracked .run/ file (backup .run/keep/).
git commit -q -m "${TASK:-T4}: batch $label — $vline | R22 $line | $cline (restruct_cycle)" || exit 1
echo "cycle: batch $label committed $(git log --oneline -1 | cut -c1-9) — $vline | $line"
done