Adds support for composing without a base commit #4656
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
axosoft-ramint
force-pushed
the
feature/composer-no-base-commit
branch
from
4b8ebee to
2525c58
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.
Closes #4637
Strategy here is to create an empty base commit without touching the working tree by using temporary index and commit-tree, then pointing HEAD to it, and then there is a commit that we can stash on temporarily. We then proceed to create the composer commits as patches and commit them with a similar strategy, except they are on another temporary index off the root sha. Then when we reset, our stash and empty commit are orphaned but still accessible. We pop the stash as normal and then let garbage collection eliminate the temporary empty commit we created.