Add base commit option to start splitting from#4
Open
basile-henry wants to merge 1 commit intodjpohly:masterfrom
Open
Add base commit option to start splitting from#4basile-henry wants to merge 1 commit intodjpohly:masterfrom
basile-henry wants to merge 1 commit intodjpohly:masterfrom
Conversation
Owner
|
I wonder if the parsing might be done by Git itself, which would be more ideal than shell parsing. For instance, if "base" is the merge-base of master and massive-pr, "master..massive-pr" would be the same as "base..massive-pr" when passed to most Git commands (including rev-list, which drives the main loop in split-branch). The original filter-branch does something like this and might be worth looking into, and our case is simpler, as we only accept one source branch. FYI, done in shell, it'd be something like: |
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
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.
This small PR adds the option to start from
<base>commit rather than from the beginning of the repo's history.This has the advantage of being much faster when we only want to split a branch over the more recent commits. And it also makes it possible to keep the history before that
<base>commit intact, which is useful when splitting a big PR into small PRs that all start from the same point in the repo's history.I understand the current interface is not ideal, maybe
basecommit..headrefwould be preferable to the current-b basecommit headref.I'll see if I can implement this. Any tips to do that kind of parsing in bash? 😄