github / github/gh-stack

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

Aberta
#488 0 comentários 0 reações 0 responsáveis Ver no GitHub
Linguagem predominante
Go
Estrelas
1.5k
Forks
70
Merge médio
1d 8h
PRs com merge (30d)
7

Descrição

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

Guia de contribuição

Abrir o guia de contribuição

Direção de pesquisa

Reproduza o empty-diff stack do issue e, em seguida, rastreie os fluxos de gh stack init e gh stack submit que criam ou enviam PRs. Determine onde uma branch não tem commits além de sua base e defina se o comando deve emitir um aviso ou parar. A tarefa estará concluída quando o caso de diff vazio não for mais marcado silenciosamente e de forma automática como merged, com cobertura para o cenário de stack relatado.

Escrita pelo modelo de indexação a partir do texto da issue.

Avaliação

Stack de tecnologia
go
Domínio
cli
Tipo de issue
Bug
Dificuldade
4/5
Tempo estimado
3-5 dias
Status de atividade
Ativa
Clareza
Razoavelmente clara
Facilidade para iniciantes
48/100

Receba novas issues na sua caixa de entrada

Um resumo curto de issues do GitHub para quem está começando.