Fix the unit test that silently skipped the re-parenting path#57
Merged
Conversation
When the simulated squash cherry-pick lands in the same second as the original feature1 commit, it reproduces its sha exactly; the script then sees the child as already up to date and the test passes without exercising git-merge-onto at all. When the timing crosses a second boundary, the run reaches git-merge-onto, which refuses to start because the test's own tee output sits untracked inside the test repo. So the test either tested nothing or flaked. Cherry-pick with -x so the sha always differs, and write the run log outside the repo.
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
2 participants
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.
When the simulated squash cherry-pick in test_update_pr_stack.sh lands in the same second as the original feature1 commit, it reproduces its sha exactly; the script then sees the child as already up to date and the test passes without exercising git-merge-onto at all. When the timing crosses a second boundary, the run reaches git-merge-onto, which refuses to start because the test's own tee output sits untracked inside the test repo. So since #56 the test either tested nothing or flaked.
Cherry-pick with
-xso the sha always differs, and write the run log outside the repo. Found while rebasing #52.Generated by Claude Code