Detect and prevent empty-diff PRs from being auto-marked as merged during stack submit
- Vorherrschende Sprache
- Go
- Sterne
- 1.5k
- Forks
- 70
- Ø Merge
- 1 T. 8 Std.
- Gemergte PRs (30 T.)
- 7
Beschreibung
## 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)._
Beitragsleitfaden
Rechercherichtung
Reproduziere den empty-diff stack im issue und verfolge anschließend die Abläufe von gh stack init und gh stack submit, die PRs erstellen oder einreichen. Ermittle, an welcher Stelle ein Branch keine Commits über seine Basis hinaus hat, und lege fest, ob der Befehl warnen oder abbrechen soll. Erledigt ist die Aufgabe, wenn der Fall mit leerem Diff nicht mehr stillschweigend automatisch als gemergt markiert wird und der gemeldete Stack-Fall durch Tests abgedeckt ist.
Vom Indexierungsmodell aus dem Issue-Text verfasst.
Bewertung
- Tech-Stack
- go
- Bereich
- cli
- Issue-Typ
- Bug
- Schwierigkeit
- 4/5
- Geschätzter Aufwand
- 3-5 Tage
- Aktivitätsstatus
- Aktiv
- Klarheit
- Größtenteils klar
- Anfängerfreundlichkeit
- 48/100