(#1088) post-rewrite hook does not track intermediate commits from an interactive rebase#1419
Merged
claytonrcarter merged 4 commits intoarxanas:masterfrom Sep 18, 2025
Merged
Conversation
Owner
|
Will look at this later, want to get the next release out soon |
Contributor
Author
|
Bump! |
Contributor
Author
|
@arxanas friendly bump! @claytonrcarter I see that you've been active recently. If possible could you take a look? |
Collaborator
|
Thanks for this. I've confirmed that the test fails on master but passes here. Also that the outstanding review comments were addressed. I wonder if this will make #1022 easier to implement; I recall that that tended to leave a lot a intermediate commits lying around. 🤔 |
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
3 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.
Fixes #1088
This pull request copies the changes from #1098 and addresses arxanas' comments.
I was able to repro the issue from #1088. It seems that we are tracking the intermediate commits created by a rebase and adding them to the events db during the post rewrite hook. I noticed that this code was added to prevent aborted rebases from adding intermediate commits, but the test written for that still passes.