github / github/gh-stack

rebase discards a still-valid recorded base after the parent's history is edited, replaying the parent's old commits

Đang mở
#471 1 bình luận 1 reaction 0 người được giao Xem trên GitHub
Ngôn ngữ chính
Go
Star
1.5k
Fork
70
Merge trung bình
1 ngày 8 giờ
Pull request đã merge (30 ngày)
7

Mô tả

(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.

Hướng dẫn đóng góp

Mở hướng dẫn đóng góp

Hướng nghiên cứu

The payload names no implementation files or tests. Start at the `gh stack rebase` entry point and reproduce the amended-parent case, then trace how the recorded base is accepted or discarded. Done means B replays only B1 after parent or trunk history edits, including the silent-corruption variant, with regression coverage for both cases.

Do mô hình lập chỉ mục viết ra từ nội dung của issue.

Đánh giá

Công nghệ
git, go
Lĩnh vực
cli, developer-experience
Loại issue
Lỗi
Độ khó
4/5
Thời gian dự kiến
3-5 ngày
Mức độ hoạt động
Sôi nổi
Độ rõ ràng
Khá rõ ràng
Mức phù hợp với người mới
52/100

Nhận issue mới trong hộp thư của bạn

Bản tóm tắt ngắn những issue GitHub phù hợp với người mới.