github / github/gh-stack

Detect and prevent empty-diff PRs from being auto-marked as merged during stack submit

未关闭
#488 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看
主要语言
Go
星标
1.5k
派生
70
平均合并
1 天 8 小时
30 天内合并 PR
7

描述

## 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`:

1. Commit to `A` (intending it for `B`).
2. Check out `B` from `A` without making a new commit.
3. Push `B` and open PRs for `A` and `B`.
4. Run `gh stack init` to adopt the two branches into a stack.
5. 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

- https://github.com/github/mdash-connector/pull/14
- https://github.com/github/mdash-connector/pull/15

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](https://github.slack.com/archives/C09M2GA1KQX/p1787881967913419?thread_ts=1787881967.913419&cid=C09M2GA1KQX)._

贡献指南

打开贡献指南

调研方向

复现 issue 中的 empty-diff stack,然后跟踪创建或提交 PRs 的 gh stack init 和 gh stack submit 流程。确定 branch 没有超出其 base 的 commit 的位置,并定义 command 应该发出警告还是停止。当 empty-diff 情况不再被静默地自动标记为 merged,并且已覆盖报告中的 stack 场景时,即表示完成。

由索引模型根据 Issue 内容生成。

评估

技术栈
go
领域
cli
Issue 类型
缺陷
难度
4/5
预计耗时
3-5 天
活跃度
活跃
描述清晰度
基本清楚
新手友好度
48/100

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。