Merge enhancements #94
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
ajoberstar
added a commit
that referenced
this pull request
Jan 2, 2016
ajoberstar
added a commit
that referenced
this pull request
Jan 2, 2016
|
Thanks! |
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.
This is to fix #93.
All the current specs still pass. I first attempt to get a ref which results in the correct merge message. If a ref is not found (a partial sha would cause this), then I fall back to the old way of doing things which resolves the sha of the commit instead of a ref.
While I was looking at the code, I also noticed the jgit allows a message to be passed to the merge command so I went ahead and added that here as well. It has no tests though so if you want I can remove it from this PR.