`gh stack rebase` uses the wrong onto boundary for merged branches
还没有人认领这个 Issue。
评估
调研方向
Start in internal/github/github.go and cmd/utils.go, then read cmd/rebase_test.go for the existing rebase boundary behavior. Run the rebase test and review the linked commit for the intended remote-versus-local SHA scenario. Done means the test covers local SHA A versus remote SHA B and gh stack rebase selects the remote merge point.
由索引模型根据 Issue 内容生成。
描述
Problem: gh-stack needs to know "what was branch X's last commit right before it got merged" so it can skip replaying that history into upstack branches. Currently, it resolves this from the local clone instead of GitHub.
So, if branch X gets rebased elsewhere before merging, the local copy goes stale. That's normal and expected, however gh stack rebase fails to notice this and tries to replay from the wrong commit. This has led to spurious merge conflicts on files I didn't even touch, leading me to rebasing branches one-by-one or fixing the gh-stack state by hand (or with an agent).
Fix: I wrote a fix here. Full disclosure: I used Claude to write the fix but I manually reviewed and edited it afterwards.
I would open a PR for this but it's locked to contributors only.
Changes:
internal/github/github.go: Add one field,HeadRefOid, toPullRequest. This tracks the remote's record of the exact commit which was merged.cmd/utils.go:- When a PR is detected as merged, save its
HeadRefOidvalue. - When computing the rebase boundary, use
HeadRefOidinstead of getting the (possibly stale) local SHA throughgit.
- When a PR is detected as merged, save its
cmd/rebase_test.go: Add a test that fakes the problem scenario ("local has SHA A, but remote has SHA B (the real merge point)" and checks the tool picks B. This test fails without the above fixes, and passes with them.
Net effect: The onto boundary now comes from remote / GitHub (can't go stale) instead of local, eliminating confusing rebase conflicts due to a misconfigured rebase.
- 主要语言
- 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