HTTP 422 when resubmitting a stack with a new bottom branch after merge
还没有人认领这个 Issue。
评估
调研方向
从 gh stack submit 的覆盖流程以及对 /repos/org-name/repo-name/stacks/656/unstack 的堆栈替换请求开始;重现合并 branch-a、添加 branch-d 以及重新提交的顺序。完成的标准是现有堆栈可以在不出现 HTTP 422 的情况下被替换,并且 GitHub 反映出 branch-d、branch-b 和 branch-c。
由索引模型根据 Issue 内容生成。
描述
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
- 主要语言
- Go
- 星标
- 1.5k
- 派生
- 73
- 平均合并
- 1 天 8 小时
- 30 天内合并 PR
- 7
贡献指南
从这里开始
- 先读完整个 Issue,再读项目的贡献指南。
- 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
- Fork 仓库,在一个分支上完成修改。
- 提交 Pull Request,并在描述里引用这个 Issue 编号。
github/gh-stack 的其他 Issue
-
难度 2/5 1-3 小时 新手友好度 85/100
-
难度 1/5 1 小时以内 新手友好度 92/100
-
feature request topic: cli - general
难度 2/5 1-3 小时 新手友好度 68/100
-
feature request topic: auto-merge
难度 2/5 1-3 小时 新手友好度 68/100
-
bug topic: docs
难度 1/5 1 小时以内 新手友好度 68/100
相似的 Issue
-
textual definition
难度 1/5 1 小时以内 新手友好度 90/100
geneontology/go-ontology#32653 ·
-
难度 1/5 1 小时以内 新手友好度 75/100
-
needs design
难度 2/5 1-3 小时 新手友好度 75/100
-
Priority/High ready-for-agent Severity/Major Type/Bug
难度 2/5 1-3 小时 新手友好度 75/100
-
难度 2/5 1-3 小时 新手友好度 70/100