`gh stack checkout` reports "Local stack matches remote" without comparing local branch refs
還沒有人認領這個 Issue。
評估
研究方向
從 gh stack checkout 命令開始,追蹤回報 Local stack matches remote 的檢查;使用 git reset --hard 移動本機分支 ref 後,執行提供的重現步驟。完成的標準是,該命令將記錄的或遠端的 heads 與實際的本機 refs 進行比較,在出現偏差時發出警告,並指出建議使用 git branch -f 進行修正。
由索引模型根據 Issue 內容生成。
描述
Summary
gh stack checkout reports ✓ Local stack matches remote when a local branch has diverged from its remote counterpart. It appears to compare its recorded state against the remote, and never against the actual local branch refs — so a local branch that has moved is invisible to the check.
$ git rev-parse --short=10 stack-b-two # local
df863cea57
$ git rev-parse --short=10 origin/stack-b-two # remote, one commit ahead
41fd74d3ae
$ gh stack checkout 6
✓ Local stack matches remote — switching to branch (stack #6)
ℹ Already on stack-b-two
$ gh stack view --short # no warning, no ⚠ Needs rebase
Stack #6
» stack-b-two ○ #5 (current)
├ stack-b-one ○ #4
└ main
The extension's own state file held the correct value the whole time:
$ jq -r '.stacks[].branches[] | select(.branch=="stack-b-two") | .head' .git/gh-stack
41fd74d3ae... # matches the remote; the local ref is what diverged
So this is not stale metadata. Recorded state and remote agreed, the local ref disagreed with both, and nothing compared against it.
Why this matters
This is the reassurance a user sees immediately before #380 destroys their work. In that state gh stack push rewinds the remote branch and the commits become unreachable — and if the branch loses its only commit, GitHub auto-closes the PR with no files. The sequence is:
gh stack checkout <n> -> "✓ Local stack matches remote"
gh stack push -> "✓ Pushed N branches" (remote commits gone, PR closed)
Fixing #380 addresses the destruction. Fixing this addresses the false confidence that leads someone to run the command in the first place.
How a local branch gets behind
Anything not mediated by the extension. A plain git fetch after a colleague pushes; CI committing to the PR head branch (the trigger in #380); or building a change in a git worktree and pushing it with git push origin <scratch-ref>:<pr-branch>, which moves the remote and leaves the local branch untouched.
Reproduction
Against a stack whose branches are in sync:
git switch <top-branch>
git reset --hard HEAD~1 # simulate the local branch falling behind
gh stack checkout <stack-number> # -> "✓ Local stack matches remote"
gh stack view --short # -> no warning
Public repo with two stacks set up for this: https://github.com/xn/gh-stack-repro
Expected
Compare recorded/remote heads against the actual local branch refs. On divergence, say so and name the fix (git branch -f <b> origin/<b>), rather than reporting a match.
A gh stack status / gh stack doctor surfacing per-branch local-vs-remote drift would cover the general case, since plain git will always be able to desync the extension's state.
Environment
gh2.97.0gh-stackv0.1.0- git 2.50.1
- macOS 26.4.1, darwin/arm64
Related
- #380 — the data loss this false reassurance leads into.
- #193 — handling rebases performed outside
gh stack; same general gap (external git operations invisible to the extension).
- 主要語言
- Go
- 星號
- 1.5k
- 分支
- 73
- 平均合併
- 1 天 8 小時
- 30 天內合併 PR
- 7
貢獻指南
從這裡開始
- 先讀完整個 Issue,再讀專案的貢獻指南。
- 在 Issue 下留言說明你要接手 —— 這能避免兩個人做同樣的事。
- Fork 儲存庫,在一個分支上完成修改。
- 送出 Pull Request,並在描述裡引用這個 Issue 編號。
github/gh-stack 的其他 Issue
-
難度 2/5 1-3 小時 新手友好度 85/100
-
難度 1/5 1 小時以內 新手友好度 92/100
-
feature request topic: cli - general
難度 2/5 1-3 小時 新手友好度 68/100
-
feature request topic: auto-merge
難度 2/5 1-3 小時 新手友好度 68/100
-
bug topic: docs
難度 1/5 1 小時以內 新手友好度 68/100
相似的 Issue
-
textual definition
難度 1/5 1 小時以內 新手友好度 90/100
geneontology/go-ontology#32653 ·
-
難度 1/5 1 小時以內 新手友好度 75/100
-
needs design
難度 2/5 1-3 小時 新手友好度 75/100
-
Priority/High ready-for-agent Severity/Major Type/Bug
難度 2/5 1-3 小時 新手友好度 75/100
-
難度 2/5 1-3 小時 新手友好度 70/100