From 3c631ed6370a130ba8d64c24e950a0f1c0a19f9c Mon Sep 17 00:00:00 2001 From: garrytan Date: Sat, 3 Oct 2026 00:02:29 +0000 Subject: [PATCH] gstack-upgrade: drop issue numbers and version history, keep rationale (s09 M20) Template-only commit: generated SKILL.md is expected red until the regeneration commit. --- gstack-upgrade/SKILL.md.tmpl | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gstack-upgrade/SKILL.md.tmpl b/gstack-upgrade/SKILL.md.tmpl index 79e931eec..32f2b03dc 100644 --- a/gstack-upgrade/SKILL.md.tmpl +++ b/gstack-upgrade/SKILL.md.tmpl @@ -127,15 +127,14 @@ Use the install type and directory detected in Step 2: **For git installs** (global-git, local-git): -Fast-forward first (#2517) — the same policy the session-update auto-upgrade +Fast-forward first — the same policy the session-update auto-upgrade uses. `--autostash` carries local edits over the pull; render-footprint dirt -is discarded first because it is regenerable and poisons stashes (#2569): +is discarded first because it is regenerable and poisons stashes: ```bash cd "$INSTALL_DIR" -# Discard render-footprint dirt (#2569): pre-v1.67 gbrain-enabled installs -# ran gen:skill-docs:user IN PLACE, leaving generated SKILL.md / sections -# files permanently modified. They are regenerable (setup re-renders to -# ~/.gstack/render), so discarding is lossless. +# Discard render-footprint dirt: older gbrain-enabled installs rendered +# generated SKILL.md / sections files IN PLACE. They are regenerable (setup +# re-renders to ~/.gstack/render), so discarding is lossless. git checkout -- 'SKILL.md' '*/SKILL.md' '*/sections/*.md' 2>/dev/null || true git fetch origin PRE_UPGRADE_COMMIT=$(git rev-parse HEAD) @@ -153,7 +152,7 @@ On `SETUP_FAILED`, STOP; keep user changes and report the recovery commit. There **Fallback (ff-only refused — local commits or divergence).** `git reset --hard` DESTROYS things: a clean tree with unpushed local commits still loses -those commits. Gate it (#2517): +those commits. Gate it: 1. Run `git status --porcelain` and `git rev-list origin/main..HEAD --oneline` in `$INSTALL_DIR`. @@ -283,7 +282,7 @@ for how to add new migrations. A browse daemon started before the upgrade keeps serving the OLD binary's code until it is stopped — it survives `git reset --hard` and `./setup` because the -running process holds the old executable (#2551). Always run this step, using +running process holds the old executable. Always run this step, using the install directory detected in Step 2. ```bash