Bump libgit to 0bf0526 - #1187
Merged
johnhaley81 merged 11 commits intoFeb 6, 2017
Merged
johnhaley81 merged 11 commits into
johnhaley81 merged 11 commits into
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
srajko
force-pushed
the
bump-libgit
branch
3 times, most recently
from
7c4cf10 to
885b8d0
Compare
January 10, 2017 20:24
srajko
force-pushed
the
bump-libgit
branch
3 times, most recently
from
249950b to
d86d06b
Compare
January 27, 2017 23:34
srajko
force-pushed
the
bump-libgit
branch
3 times, most recently
from
0ea4c7b to
3955137
Compare
January 30, 2017 22:03
Copy link
Copy Markdown
Collaborator
Author
|
This underwent stability testing in a GitKraken staging build. The only things that we noticed are changes in what the revwalk returns (due to libgit2/libgit2#3921), and changes in error messages (nodegit/libgit2@909d549). |
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
|
This has been working well in GK vNext. PRs are open to merge in 2 of the 3 commits above: libgit2/libgit2#4097 A PR is needed to start talking about merging in libgit2/libgit2@2afaae5 unless I've missed it somewhere. (/cc @implausible) The above commits are necessary to get proxies working on all 3 platforms which has been a huge issue. NodeGit will be updated to reflect any decisions made in libgit2 wrt the above PRs. |
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Summary of changes pulled in from libgit2Changes not currently in master branch of libgit2
Changes currently in master branch on libgit2
|
Sorry, something went wrong.
tommoor
pushed a commit
to goabstract/nodegit
that referenced
this pull request
Mar 27, 2017
Bump libgit to 0bf0526
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 updates the bundled nodegit to 0.25.1 with some additional patches. It goes further than the official release up to libgit2/libgit2@176f555 (the commit after that breaks the build). It also includes some patches that are not yet merged into libgit2 - libgit2/libgit2@0f3fe10 (Do not discard proxy_options that have been set when auto is specified), libgit2/libgit2@2afaae5 (negotiate always fails via libcurl) and libgit2/libgit2@0bf0526 (Fix digest credentials for proxy in windows).
The bump required minor adjustments in nodegit (some just related to tests), and the only one I am not confident about is 45ce97d. That test now gives two different kinds of errors, and I don't know enough about the expected failure to know whether both errors indicate that the test was successful.