Partial merge leaves stale stack base and Rebase stack replays merged commits
Ninguém assumiu esta issue ainda.
Avaliação
- Dificuldade
- 4/5
- Tempo estimado
- 3-5 dias
- Facilidade para iniciantes
- 42/100
Direção de pesquisa
Comece rastreando os caminhos de merge-queue admission e Rebase stack, concentrando-se em como o base SHA do objeto Stack é atualizado após um merge parcial. Reproduza o cenário de oito PRs e inspecione a base ref e o SHA informados antes e depois de Rebase stack. Está concluído quando o stack restante aponta para o commit atual de main, admite um sufixo verificado e não reproduz commits já mesclados.
Escrita pelo modelo de indexação a partir do texto da issue.
Descrição
Reproduction
- Create a stack with a merge queue on
main. - Merge a bottom prefix of the stack, leaving eight pull requests open.
- Rebase the eight remaining branches locally onto the current
main, then force-push them as one atomic ref update. - Verify that the lowest open branch is one commit ahead of
main, zero commits behind, and that every higher branch contains the branch below it. - Verify that every open pull request is approved and has passing required checks.
- Enqueue the remaining stack from its top pull request.
All eight pull requests entered the queue within one second. Eighteen seconds later, the lowest open pull request was removed with:
github-merge-queue removed this pull request from the merge queue due to invalid changes in the merge commit
Every higher pull request was then removed because an earlier pull request in the stack was removed. No merge_group workflow was created.
The stack merge box reported that the stack was out of date with main. The pull request API reported stack.base.ref = main, but stack.base.sha still identified the last layer of the already-merged prefix rather than the current main commit.
- Click Rebase stack in the GitHub UI.
The UI reported that all eight branches were rebased and that the stack had a linear history. The actual lowest branch changed from one commit ahead and zero behind to 16 commits ahead and 15 behind. Commits already present on main reappeared in the pull request.
Expected
After a partial stack merge, GitHub updates the remaining stack's base to the current main commit and retargets the lowest open pull request to main, as described in Merging stacked pull requests.
A locally verified linear suffix based on current main should enter the merge queue. Rebase stack must use the current base commit and must not replay commits that already landed.
Actual
The remaining stack retains a stale base SHA after the partial merge. Merge-queue admission rejects a correct branch graph before creating a merge group. Rebase stack then rewrites the branches against the stale anchor and reintroduces already-merged commits.
Recovery requires restoring every branch ref, removing the stale Stack object, retargeting the lowest open pull request to main, and linking the same pull requests into a new stack.
Environment
- GitHub Stacked Pull Requests public preview.
- GitHub merge queue.
- Original stack: 26 pull requests, with 18 merged and eight open.
- All open pull requests approved and required checks passing.
gh stackv0.1.0.gh2.96.0.- git 2.50.1.
- macOS arm64.
Related
- #174 concerns approval invalidation after a partial merge. Approvals remained valid in this reproduction.
- #444 concerns a pull request being closed at a merge-group boundary. The remaining pull requests stayed open in this reproduction, but the stack base remained stale.
- Linguagem predominante
- Go
- Estrelas
- 1.5k
- Forks
- 73
- Merge médio
- 13h 24min
- PRs com merge (30d)
- 3
Preparar o ambiente
Primeiros passos
- Leia a issue inteira e depois o guia de contribuição do projeto.
- Comente na issue dizendo que vai assumir — evita que duas pessoas façam o mesmo trabalho.
- Faça um fork do repositório e trabalhe em uma branch.
- Abra um pull request que referencie o número da issue.
Mais de github/gh-stack
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 85/100
-
Dificuldade 1/5 Menos de uma hora Facilidade para iniciantes 92/100
-
feature request topic: cli - general
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 68/100
-
feature request topic: auto-merge
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 68/100
-
bug topic: docs
Dificuldade 1/5 Menos de uma hora Facilidade para iniciantes 68/100
Todas as issues de github/gh-stack
Issues semelhantes
-
bug needs triage
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 78/100
netdata/netdata#24062 · 1 comentário ·
Mantenedores costumam responder em até 1 dia
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 88/100
meshery/meshery#22119 · 1 comentário ·
Mantenedores costumam responder em até 1 dia
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 78/100
Mantenedores costumam responder em até 1 dia
-
automation documentation
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 78/100
Mantenedores costumam responder em até 1 dia
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 68/100
Mantenedores costumam responder em até 1 dia