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.

Sign up for GitHub

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

Jump to bottom

Update libgit2 to v0.27.7 #30584

Merged
merged 2 commits into from
Jan 5, 2019
Merged

Update libgit2 to v0.27.7 #30584

merged 2 commits into from
Jan 5, 2019

Conversation

ararslan
Copy link
Member

@ararslan ararslan 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.

@ararslan ararslan added building Build system, or building Julia or its dependencies libgit2 The libgit2 library or the LibGit2 stdlib module external dependencies Involves LLVM, OpenBLAS, or other linked libraries labels Jan 4, 2019
@staticfloat
Copy link
Member

Looks like our patches do not apply cleanly anymore. 😱

@ararslan
Copy link
Member Author

ararslan commented Jan 4, 2019

Boooooooo. I'll fix them...

@omus
Copy link
Member

omus commented Jan 4, 2019 •
edited
Loading

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

julia/stdlib/LibGit2/src/gitcredential.jl

Lines 227 to 237 in a153fea

# 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
Copy link
Member Author

ararslan 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
Copy link
Member Author

ararslan commented Jan 5, 2019

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

@ararslan
Update libgit2 to v0.27.7
0e3f155
@ararslan
Remove problematic portions of the libgit2 patches
789071a 
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.
omus
omus approved these changes Jan 5, 2019
View reviewed changes
Copy link
Member

@omus omus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@ararslan ararslan deleted the aa/libgit2-0.27.7 branch January 5, 2019 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@omus omus omus approved these changes

@staticfloat staticfloat Awaiting requested review from staticfloat

Assignees
No one assigned
Labels
building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries libgit2 The libgit2 library or the LibGit2 stdlib module
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ararslan @staticfloat @omus