Fix git filter-branch rewriting wrong commits when --max-commits is used - #33
Open
akai-hana wants to merge 1 commit into
Open
Fix git filter-branch rewriting wrong commits when --max-commits is used#33akai-hana wants to merge 1 commit into
akai-hana wants to merge 1 commit into
Conversation
Currently, grec overwrites the commit messages in reverse order whenever a `--max-commits` is specified. This comes down to `git filter-branch` being invoked with a bare HEAD revision, causing it to walk and rewrite the entire history from the root commit instead of just the commits actually processed. This is what results on a desync of the counter-based msg-filter script, so messages generated for recent commits were applied to the repo's oldest commits instead, in the complete reverse order. This pull request adds `getRewriteRange()` to anchor the filter-branch invocation to `<parent-of-oldest-processed-commit>..HEAD`, keeping msg-filter invocations in sync with the processed commit list.
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.
Currently, grec overwrites the commit messages in reverse order whenever a
--max-commitsis specified.This comes down to
git filter-branchbeing invoked with a bare HEAD revision, causing it to walk and rewrite the entire history from the root commit instead of just the commits actually processed. This is what results on a desync of the counter-based msg-filter script, so messages generated for recent commits were applied to the repo's oldest commits instead, in the complete reverse order.This pull request adds
getRewriteRange()to anchor the filter-branch invocation to<parent-of-oldest-processed-commit>..HEAD, keeping msg-filter invocations in sync with the processed commit list.