Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libgit2 to v0.27.7 #30584

Merged
merged 2 commits into from Jan 5, 2019

Conversation

@ararslan
Copy link
Member

commented Jan 4, 2019

Currently we're using v0.27.2. The full commit diff between 0.27.2 and 0.27.7 can be viewed here. According to the release notes for some of the the interim versions (https://github.com/libgit2/libgit2/releases), we're currently missing out on security and bug fixes.

@staticfloat

This comment has been minimized.

Copy link
Member

commented Jan 4, 2019

Looks like our patches do not apply cleanly anymore. 😱

@ararslan

This comment has been minimized.

Copy link
Member Author

commented Jan 4, 2019

Boooooooo. I'll fix them...

@omus

This comment has been minimized.

Copy link
Member

commented Jan 4, 2019

I believe most of the patches shouldn't be needed anymore. I'm rather pumped about this as it'll fix this problem:

# Due to a bug in libgit2 iteration we may read credential helpers out of order.
# See: https://github.com/libgit2/libgit2/issues/4361
#
# Typically the ordering doesn't matter but does in this particular case. Disabling
# credential helpers avoids potential issues with using the wrong credentials or
# writing credentials to the wrong helper.
if isempty(value)
@warn """Resetting the helper list is currently unsupported:
ignoring all git credential helpers""" maxlog=1
return GitCredentialHelper[]
end

@ararslan

This comment has been minimized.

Copy link
Member Author

commented Jan 4, 2019

Ah, the patches don't apply anymore because we're using the diff from a PR that touches their .travis.yml file, which has since been removed, as they've switched their CI to Azure pipelines.

@ararslan ararslan force-pushed the aa/libgit2-0.27.7 branch from 5bbbaf8 to 113377a Jan 4, 2019

@ararslan

This comment has been minimized.

Copy link
Member Author

commented Jan 5, 2019

The 32-bit Windows failure is #29880 and the macOS failure should be fixed by #30599.

ararslan added 2 commits Jan 4, 2019
Remove problematic portions of the libgit2 patches
These patches make changes to libgit2's .travis.yml file which was
removed when libgit2 switched to Azure Pipelines for CI. Since they are
non-functional changes for us, we can simply remove them from the diff.

@ararslan ararslan force-pushed the aa/libgit2-0.27.7 branch from 113377a to 789071a Jan 5, 2019

@omus
omus approved these changes Jan 5, 2019
Copy link
Member

left a comment

LGTM. I was hoping we'd be able to drop some patches with this update. Oh well.

@ararslan ararslan merged commit c0721ad into master Jan 5, 2019

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
julia freebsd ci Build done
Details

@ararslan ararslan deleted the aa/libgit2-0.27.7 branch Jan 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.