reparent: add a --commit option
#132
Merged
Conversation
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
Add an option `git imerge reparent --commit=COMMIT`, which allows the parents of an arbitrary commit to be changed. Moreover, the descendants of COMMIT are also rewritten all the way to HEAD. This feature was suggested by Ke Ma <[email protected]>, and the implementation is partly derived from PR #130 submitted by Ke Ma.
make1980-zz
reviewed
Jun 25, 2018
| ) | ||
|
|
||
|
|
||
| def reparent_recursively(git, start_commit, parents, end_commit): |
There was a problem hiding this comment.
nit: this isn't a recursive process but rather an iterative process
Owner
Author
There was a problem hiding this comment.
It is in fact recursive; it's just that the recursion is built into git log --topo-order --reverse rather than coded explicitly here. But this is just an internal name so I don't think the distinction matters much.
|
I have verified that this implementation works for our case. Please submit. |
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.
Add an option
git imerge reparent --commit=COMMIT, which allows the parents of an arbitrary commit to be changed. Moreover, the descendants of COMMIT are also rewritten all the way to HEAD.Fixes #129.
This is an alternative implementation of #130.
@make1980: does this work for you?