Detect and prevent empty-diff PRs from being auto-marked as merged during stack submit
还没有人认领这个 Issue。
评估
调研方向
复现 issue 中的 empty-diff stack,然后跟踪创建或提交 PRs 的 gh stack init 和 gh stack submit 流程。确定 branch 没有超出其 base 的 commit 的位置,并定义 command 应该发出警告还是停止。当 empty-diff 情况不再被静默地自动标记为 merged,并且已覆盖报告中的 stack 场景时,即表示完成。
由索引模型根据 Issue 内容生成。
描述
Summary
When using gh stack, it's possible to end up with a PR whose head branch has no commits beyond its base branch (i.e., an empty diff). When this happens, GitHub automatically marks that PR as "merged" as soon as it is synchronized (e.g., via gh stack submit pushing to origin), even though no actual merge was intended.
Repro scenario
Given a stack main <- branch A <- branch B:
- Commit to
A(intending it forB). - Check out
BfromAwithout making a new commit. - Push
Band open PRs forAandB. - Run
gh stack initto adopt the two branches into a stack. - Run
gh stack submit.
Because B's branch contains no commits beyond A, GitHub treats the PR for B as having "no diff" against its base, and the subsequent push/synchronize causes GitHub to automatically mark PR B as merged into A — even though the user never intended or triggered a merge.
Observed example
After running gh stack init followed by gh stack submit, PR #15 (branch B) was unexpectedly shown as merged into PR #14 (branch A), because branch B had no unique commits relative to branch A.
Request
gh stack should proactively detect this situation (a branch in the stack with no commits ahead of its base) and warn or prevent the user from creating/submitting a PR in that state, rather than letting it silently get auto-merged by GitHub.
Context
Reported by @jschnapper, triaged by @skarim, in a Slack thread.
Created from a Slack conversation.
- 主要语言
- 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
-
难度 2/5 1-3 小时 新手友好度 88/100
NVIDIA/gpu-operator#2955 ·
-
agentic-workflows
难度 2/5 1-3 小时 新手友好度 68/100
-
难度 1/5 1 小时以内 新手友好度 90/100
kovidgoyal/kitty#10516 ·
-
bug
难度 1/5 1 小时以内 新手友好度 90/100
cisagov/vulnrichment#337 ·
-
难度 1/5 1 小时以内 新手友好度 72/100