RomanNum3ral
/
gstack
mirror of https://github.com/garrytan/gstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge f2286b7c6a into a3259400a3

This commit is contained in:
chaotix345 2026-07-14 19:17:07 -07:00 committed by GitHub
parent a3259400a3 f2286b7c6a
commit da75659339
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gstack-upgrade/SKILL.md.tmpl
View File

@ -125,9 +125,16 @@ Use the install type and directory detected in Step 2:
**For git installs** (global-git, local-git): **For git installs** (global-git, local-git):
```bash ```bash
cd "$INSTALL_DIR" cd "$INSTALL_DIR"
STASH_OUTPUT=$(git stash 2>&1) STASH_OUTPUT=$(git stash push --include-untracked -m "pre-upgrade-$(date +%Y-%m-%d)" 2>&1)
git fetch origin git fetch origin
git reset --hard origin/main # Try fast-forward first. Safer than reset --hard and passes through guard
# hooks (Claude Code PreToolUse, pre-commit wrappers) that block destructive
# ops. Falls back to reset for divergent history — no-op when the working
# tree is clean and there are no local commits, which is the expected state
# for a global install.
if ! git merge --ff-only origin/main 2>/dev/null; then
git reset --hard origin/main
fi
./setup ./setup
``` ```
If `$STASH_OUTPUT` contains "Saved working directory", warn the user: "Note: local changes were stashed. Run `git stash pop` in the skill directory to restore them." If `$STASH_OUTPUT` contains "Saved working directory", warn the user: "Note: local changes were stashed. Run `git stash pop` in the skill directory to restore them."