rebase discards a still-valid recorded base after the parent's history is edited, replaying the parent's old commits
維護者通常 1 天內回覆
還沒有人認領這個 Issue。
評估
- 難度
- 4/5
- 預估耗時
- 3-5 天
- 新手友好度
- 52/100
- Issue 類型
- 缺陷
- 描述清晰度
- 基本清楚
- 活躍度
- 活躍
- 技術堆疊
- git, go
研究方向
該 payload 未列出實作檔案或測試。從 gh stack rebase 進入點開始，重現 amended-parent 情況，然後追蹤記錄的 base 如何被接受或捨棄。完成條件是：在 parent 或 trunk 歷史遭到編輯後，B 只重播 B1，包括靜默損壞的變體，並為這兩種情況提供回歸覆蓋。
由索引模型根據 Issue 內容生成。
描述
(This issue was AI generated but I have reviewed it, understood it, and I'm accountable for its content.)
Version: gh-stack v0.1.0.
Setup: trunk main; stack A ← B (gh stack init A B); A has commit A1 modifying f.txt, B has commit B1 adding g.txt.
Repro: amend A1 on A (change f.txt, keep the message), then gh stack rebase.
Expected: B is rebased by replaying only B1 onto the amended A — B's recorded base (old A tip) is still an ancestor of B and delimits exactly B's own commits.
Actual: the recorded base is discarded (apparently because it is no longer in A's history), the boundary falls back to merge-base(A, B) — below the amendment — and the old A1 is replayed onto the amended A: a bogus conflict in f.txt.
Worse variant (silent corruption): if the amendment only removes part of A1 (e.g. A1 touched f.txt + extra.txt, and the amend drops the extra.txt change), the old A1 replays cleanly: B ends up with a duplicated commit and the removed extra.txt resurrected — reported as success.
Suggested fix: accept a recorded base as the --onto boundary whenever it is an ancestor of the branch being rebased; membership in the parent's current history should not be required. This matches Graphite's restack semantics and is what makes stacks robust under history editing.
The same failure triggers when the trunk's history is edited (e.g. a commit below the stack is amended via fixup): the whole old trunk segment is replayed into the bottom stack branch.
- 主要語言
- Go
- 星號
- 1.6k
- 分支
- 78
- 平均合併
- 4 天 15 分鐘
- 30 天內合併 PR
- 17
環境準備
- 沒有 Dockerfile 或 Docker Compose 檔案
- 沒有 Pull Request 範本
- 閱讀貢獻指南
從這裡開始
- 先讀完整個 Issue，再讀專案的貢獻指南。
- 在 Issue 下留言說明你要接手 —— 這能避免兩個人做同樣的事。
- Fork 儲存庫，在一個分支上完成修改。
- 送出 Pull Request，並在描述裡引用這個 Issue 編號。
github/gh-stack 的其他 Issue
-
難度 2/5 1-3 小時 新手友好度 85/100
維護者通常 1 天內回覆
-
難度 1/5 1 小時以內 新手友好度 92/100
維護者通常 1 天內回覆
-
feature request topic: cli - general
難度 2/5 1-3 小時 新手友好度 68/100
維護者通常 1 天內回覆
-
feature request topic: auto-merge
難度 2/5 1-3 小時 新手友好度 68/100
維護者通常 1 天內回覆
-
bug topic: docs
難度 1/5 1 小時以內 新手友好度 68/100
github/gh-stack#429 · 3 個 reaction ·
維護者通常 1 天內回覆
相似的 Issue
-
難度 2/5 1-3 小時 新手友好度 76/100
維護者通常 1 天內回覆
-
難度 1/5 1-3 小時 新手友好度 90/100
FootprintAI/Containarium#2338 ·
維護者通常 1 天內回覆
-
[Bug]: core doesn't build standalone on dev since a17068054 (go-mp3 require dropped, go.sum pruned)未關閉
難度 2/5 1-3 小時 新手友好度 78/100
維護者通常 1 天內回覆
-
難度 2/5 1-3 小時 新手友好度 85/100
SagerNet/sing-openvpn#11 ·
-
priority: P3 type: devops
難度 2/5 1-3 小時 新手友好度 75/100
jiegui2025/hwspec#57 ·
維護者通常 1 天內回覆