Fix bug in merge! and add test #21213
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
|
good catch! was anything using this method? curious how / where you triggered this |
|
I caught it by looking at coverage. The method would fail everytime in the
c call because of the type issue so I doubt anyone was using it.
…On Tue, Mar 28, 2017, 4:53 PM Tony Kelman ***@***.***> wrote:
good catch! was anything using this method? curious how / where you
triggered this
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#21213 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAyk45yZxDfCyzqRsiJVkHPcc05upxDDks5rqZ1lgaJpZM4MsVS2>
.
|
ararslan
approved these changes
Mar 29, 2017
|
I think the commit call may need a git config argument, this is failing on the buildbots https://build.julialang.org/builders/build_ubuntu14.04-x64/builds/68/steps/shell_2/logs/stdio |
Closed
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.
Before, this would fail because we had no way to convert from
GitAnnotatedtoPtr{Void}.