fix(git): replay stacks on older Git versions - #47
Merged
kitlangton merged 1 commit intoAug 28, 2026
Merged
Conversation
Copy link
Copy Markdown
Owner
Sorry, something went wrong.
Replace the unsupported cherry-pick --empty=drop flag with sequential replay and state-based redundant-pick detection. Preserve initially empty commit failures and prevent rerere autoupdate from hiding conflicts. Read conflicts from the owning worktree and cover compatibility, hook failures, skip cleanup, and remembered resolutions with real-Git regressions.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
stack sync --apply cannot repair branches on Git 2.39 because replay passes cherry-pick --empty=drop, an option that Git does not support until 2.45. Git exits at argument parsing, so even a conflict-free replay fails.
What Changes
Empty-pick detection uses Git state, not localized stderr: exit code 1, no unmerged paths, the expected CHERRY_PICK_HEAD, a clean tracked tree, and an originally nonempty commit. Failed state inspection does not authorize a skip. Replay disables rerere's automatic index updates so a remembered conflict resolution cannot masquerade as an empty pick. Existing replay cleanup restores the current branch and removes temporary replay refs on success or failure.
Scope
Independent implementation of the compatibility problem reported in #40, with a patch changeset. No new configuration or changes to readiness policy. Sequential replay adds a Git process per commit; additional inspection runs only after a failed pick.
Verification
GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=/dev/null bun run test bun run typecheck bun run format:check bun run lint bun run package:smoke bun run changeset:status --since origin/main bun src/cli.ts --help bun src/cli.ts sync --help git diff --checkAll 169 tests pass with both a locally built Git 2.39.5 and Apple Git 2.50.1 on PATH. The unmodified 0.4.3 source fails its existing clean-worktree replay test with Git 2.39.5's cherry-pick usage error.
Six new real-repository regressions cover a redundant middle commit with opaque error text, originally empty commits, owning-worktree conflicts, commit-hook failure, failed skip cleanup, and a remembered rerere resolution. A process adapter rejects --empty=drop so the compatibility regression remains effective on newer CI installations.