Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump libgit to 0bf0526 #1187

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
Merged
merged 11 commits into from
Feb 6, 2017
Merged

Bump libgit to 0bf0526 #1187

merged 11 commits into from
Feb 6, 2017

Conversation

srajko
Copy link
Collaborator

@srajko srajko commented Jan 10, 2017 •
edited
Loading

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.

@srajko srajko force-pushed the bump-libgit branch 3 times, most recently from 7c4cf10 to 885b8d0 Compare January 10, 2017 20:24
@srajko srajko changed the title [WIP] Bump libgit to 0.24.6 [WIP] Bump libgit to 0.25.1 Jan 10, 2017
@srajko srajko force-pushed the bump-libgit branch 3 times, most recently from 249950b to d86d06b Compare January 27, 2017 23:34
@srajko srajko force-pushed the bump-libgit branch 3 times, most recently from 0ea4c7b to 3955137 Compare January 30, 2017 22:03
@srajko srajko changed the title [WIP] Bump libgit to 0.25.1 Bump libgit to 0.25.1 Feb 6, 2017
@srajko
Copy link
Collaborator Author

srajko commented Feb 6, 2017

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).

@johnhaley81
Copy link
Collaborator

This has been working well in GK vNext. PRs are open to merge in 2 of the 3 commits above:

libgit2/libgit2#4097
libgit2/libgit2#4104

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.

@johnhaley81 johnhaley81 changed the title Bump libgit to 0.25.1 Bump libgit to 0bf0526 Feb 6, 2017
@johnhaley81 johnhaley81 merged commit be4b356 into nodegit:master Feb 6, 2017
@johnhaley81 johnhaley81 deleted the bump-libgit branch February 6, 2017 16:01
@johnhaley81
Copy link
Collaborator

Summary of changes pulled in from libgit2

Changes not currently in master branch of libgit2

Changes currently in master branch on libgit2

tommoor pushed a commit to goabstract/nodegit that referenced this pull request Mar 27, 2017
@johnhaley81 @tommoor
Merge pull request nodegit#1187 from srajko/bump-libgit
a18c09c 
Bump libgit to 0bf0526
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@srajko @johnhaley81