Support rewording merge commits #533
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
arxanas
force-pushed
the
arxanas/reword
branch
from
c313f52 to
6c12944
Compare
arxanas
commented
Sep 12, 2022
arxanas
force-pushed
the
arxanas/reword
branch
3 times, most recently
from
4caa3ff to
39e66ec
Compare
Collaborator
|
This looks good to me, FWIW. I like the clean up in |
arxanas
force-pushed
the
arxanas/reword
branch
2 times, most recently
from
a6d1342 to
3423bbe
Compare
This fails if we try to upgrade it (at the time of this writing, to `0.3.15`): ``` $ cargo update # without version being locked to 0.3.11 $ cargo test -- main_branch ```
…e destination commits We can already plan to rebase merge commits, so this isn't hard to implement: we just allow passing multiple parent commits. Actually executing the merge is where complications might arise (handled in the next commit to support rewording merge commits).
We don't support rebasing merge commits in-memory at present because we don't have a method for resolving conflicts that might arise as part of the attempt to create a new merge commit. Consequently, `git reword` also doesn't work on merge commits, since it uses the rebase machinery. Since `git reword` is guaranteed not to change the contents (or topology) of any of the reworded commits, we can make an exception for this case, and permit rebasing merge commits in memory when a replacement commit is specified, because that guarantees that we won't have to resolve merge conflicts.
arxanas
force-pushed
the
arxanas/reword
branch
from
3423bbe to
a20e900
Compare
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.
Also addresses #515.