github / github/gh-stack

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

Ouverte
#488 0 commentaires 0 réactions 0 personnes assignées Voir sur GitHub
Langage dominant
Go
Étoiles
1.5k
Forks
70
Merge moyen
1 j 8 h
PR mergées (30 j)
7

Description

## 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)._

Guide de contribution

Ouvrir le guide de contribution

Piste de recherche

Reproduisez l’empty-diff stack de l’issue, puis suivez les flux gh stack init et gh stack submit qui créent ou soumettent des PRs. Déterminez à quel endroit une branche ne possède aucun commit au-delà de sa base et définissez si la commande doit avertir ou s’arrêter. Le travail est terminé lorsque le cas de diff vide n’est plus marqué silencieusement comme merged et que le scénario de stack signalé est couvert par des tests.

Rédigé par le modèle d'indexation à partir du texte de l'issue.

Évaluation

Stack technique
go
Domaine
cli
Type d'issue
Bug
Difficulté
4/5
Temps estimé
3-5 jours
Activité
Active
Clarté
Plutôt claire
Accessibilité débutants
48/100

Recevez les nouvelles issues par e-mail

Un résumé court des issues GitHub adaptées aux débutants.