Add amend commit convenience function #645
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
|
@tbranyen do you know why it can't hit http://git.tbranyen.com/smart/site-content ? Getting a 502. |
|
@johnhaley81 Not sure why it was failing before, but I just started my Node server and it seems to be cloning fine for me. |
-Added convenience method to commit.amend -Made some amend arguments optional
The expected commit hash had to change after changing the commit message.
This was done to have consistent hashes between running all tests sequentially and running a single test
Also decremented the number of expected patches within a diff test to accommodate for the reset
johnhaley81
added a commit
that referenced
this pull request
Jul 21, 2015
Add amend commit convenience function
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.
The convenience function extends the original commit amend to accepts a tree object or a treeOid.
Also included is a test for the new commit amend function.
When testing the new function we noticed that the add commit test did not reset the head to the previous commit upon completion of the test. We modified that test to do so. This caused the "can diff with a null tree" test to fail since it was expecting 85 patches and resetting the commit test brought the number of patches to 84. We modified the test to expect the correct number of patches.