HTTP 422 when resubmitting a stack with a new bottom branch after merge
Nessuno ha ancora preso questa issue.
Valutazione
- Difficoltà
- 4/5
- Tempo stimato
- 3-5 giorni
- Idoneità per principianti
- 55/100
Direzione di ricerca
Inizia dal flusso di sovrascrittura di gh stack submit e dalla richiesta di sostituzione dello stack a /repos/org-name/repo-name/stacks/656/unstack; riproduci la sequenza di unire branch-a, aggiungere branch-d e inviare nuovamente. È completato quando lo stack esistente può essere sostituito senza HTTP 422 e GitHub riflette branch-d, branch-b e branch-c.
Scritto dal modello di indicizzazione a partire dal testo della issue.
Descrizione
Summary
When using gh stack, submitting a stack fails if the bottom branch in the stack has been merged and a new branch is subsequently added below the remaining stack.
gh stack submit detects that the local stack has changed and offers to overwrite the existing stack on GitHub, but the overwrite fails because the existing GitHub stack still contains the previously merged branch.
Reproduction
Start with a stack containing three branches:
main
│
▼
branch-a
│
▼
branch-b
│
▼
branch-c
Submit the stack with gh stack submit.
At this point, the GitHub stack looks like:
main
│
▼
branch-a
│
▼
branch-b
│
▼
branch-c
1. Merge the bottom branch
Merge the PR for branch-a into main.
The remaining stack is now effectively:
main
│
▼
branch-b
│
▼
branch-c
2. Add a new branch below the stack
Create branch-d from main and add it to the bottom of the local stack.
The local stack is now:
main
│
▼
branch-d
│
▼
branch-b
│
▼
branch-c
So the local stack has changed from:
main
│
▼
branch-a
│
▼
branch-b
│
▼
branch-c
to:
main
│
▼
branch-d
│
▼
branch-b
│
▼
branch-c
3. Submit the modified stack
Run:
gh stack submit
gh stack detects that the local stack has been modified and asks:
✗ a modify was completed but the stack has not been submitted yet
? The local stack has been modified. Overwrite the existing stack on GitHub? Yes
The submit then fails with:
⚠ Failed to delete existing stack: HTTP 422: Pull request #650 cannot be removed from this stack
(https://api.example.ghe.com/repos/org-name/repo-name/stacks/656/unstack)
Expected behavior
gh stack submit should reconcile the local stack with the existing GitHub stack.
The following workflow should be supported:
Create stack
↓
Submit stack
↓
Merge bottom branch
↓
Add a new branch below the remaining stack
↓
Submit stack again
After submitting, the GitHub stack should reflect:
main
│
▼
branch-d
│
▼
branch-b
│
▼
branch-c
The previously merged branch-a should no longer be part of the stack.
Actual behavior
The submit operation attempts to overwrite the existing GitHub stack, but fails while trying to remove the existing stack:
HTTP 422: Pull request #650 cannot be removed from this stack
This prevents the modified local stack from being submitted.
Possible cause
It appears that merging the bottom branch leaves the existing GitHub stack in a state that cannot subsequently be replaced when a new branch is inserted below the remaining stack.
The problematic sequence appears to be:
Initial GitHub stack:
main
│
▼
branch-a
│
▼
branch-b
│
▼
branch-c
│
│ merge branch-a
▼
Local/GitHub stack:
main
│
▼
branch-b
│
▼
branch-c
│
│ add branch-d below branch-b
▼
Local stack:
main
│
▼
branch-d
│
▼
branch-b
│
▼
branch-c
│
│ gh stack submit
▼
HTTP 422 while removing the existing stack
The error references the top branch (branch-c / its PR), even though the structural change is at the bottom of the stack.
This may indicate that the stack replacement/unstack operation is trying to remove or reorder PRs in an order that is invalid after the original bottom PR has already been merged.
Environment
gh stack:0.1.0- OS:
macOS
Minimal reproduction
Initial:
main
└── branch-a
└── branch-b
└── branch-c
Merge branch-a:
main
└── branch-b
└── branch-c
Add branch-d below branch-b:
main
└── branch-d
└── branch-b
└── branch-c
gh stack submit
→ HTTP 422
The expected result is that the final stack is successfully updated to:
main
└── branch-d
└── branch-b
└── branch-c
- Lingua principale
- Go
- Stelle
- 1.5k
- Fork
- 73
- Merge medio
- 1g 8h
- PR unite (30g)
- 7
Guida per i contributori
Apri la guida per i contributori
Come iniziare
- Leggi tutta la issue e poi la guida ai contributi del progetto.
- Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
- Fai un fork del repository e lavora su un branch.
- Apri una pull request che faccia riferimento al numero della issue.
Altre issue di github/gh-stack
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 85/100
-
Difficoltà 1/5 Meno di un'ora Idoneità per principianti 92/100
-
feature request topic: cli - general
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
-
feature request topic: auto-merge
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
-
bug topic: docs
Difficoltà 1/5 Meno di un'ora Idoneità per principianti 68/100
Tutte le issue di github/gh-stack
Issue simili
-
textual definition
Difficoltà 1/5 Meno di un'ora Idoneità per principianti 90/100
geneontology/go-ontology#32653 ·
-
Difficoltà 1/5 Meno di un'ora Idoneità per principianti 75/100
-
needs design
Difficoltà 2/5 1-3 ore Idoneità per principianti 75/100
-
Priority/High ready-for-agent Severity/Major Type/Bug
Difficoltà 2/5 1-3 ore Idoneità per principianti 75/100
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 70/100