amend: Fix amending HEAD #116
Merged
Conversation
This file contains 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
Previous change to amend tried to eliminate a double-call of write-tree, which was both used to elide the final cherrypick as well as make the temp commit that is used for cherry-picking. However it erroneously didn't set the top tree for the len == 1 case which meant that amends of HEAD itself did not actually do any amending. Fix this by writing the tree in the correct line, and pointing the temp commit to that tree. This still manages to avoid a double call to write-tree. Because drop is always false when making the temp commit, we know the tree must have been written earlier.
|
Reviews in this chain: |
aaron-skydio
approved these changes
Apr 27, 2023
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.
Previous change to amend tried to eliminate a double-call
of write-tree, which was both used to elide the final cherrypick
as well as make the temp commit that is used for cherry-picking.
However it erroneously didn't set the top tree for the len == 1
case which meant that amends of HEAD itself did not actually
do any amending.
Fix this by writing the tree in the correct line, and pointing
the temp commit to that tree. This still manages to avoid a
double call to write-tree. Because drop is always false when
making the temp commit, we know the tree must have been written
earlier.