Skip to content

Upgrade libgit2 to 1.3.1#1894

Merged
ianhattendorf merged 12 commits intonodegit:masterfrom
zawata:libgit-1.3.0-update
Apr 25, 2022
Merged

Upgrade libgit2 to 1.3.1#1894
ianhattendorf merged 12 commits intonodegit:masterfrom
zawata:libgit-1.3.0-update

Conversation

@zawata
Copy link
Contributor

@zawata zawata commented Feb 23, 2022 •
edited
Loading

Several changes were made:

  • commit signing callback was deprecated in favor of a commit creation callback
    • callback returns an OID through a pointer to an oid struct. not sure if this could be handled better, looking for suggestions
    • contains a list parameter that required some modification to accommodate
  • public git_buf modification functions were deprecated as modifying git_buffers are now considered internal only
    • the only place this affects us is in the git_filter apply callback function which has also been deprecated but will be modified in another PR since it requires bigger changes
  • adjusted arrayType regex to accommodate array parameters
  • removed win32 long-paths since it's included in libgit2 config handling
  • fix compilation of new ntlmclient version

Note: A majority of the PR changes are the new Libgit2-docs.json

@zawata zawata force-pushed the libgit-1.3.0-update branch from 11ec270 to 45b815c Compare February 23, 2022 23:39
@zawata zawata changed the title [WIP]Upgrade libgit2 to 1.3.0 Upgrade libgit2 to 1.3.0 Mar 18, 2022
@zawata zawata force-pushed the libgit-1.3.0-update branch from 0f65006 to 42faeed Compare March 23, 2022 15:50
@zawata zawata mentioned this pull request Mar 23, 2022
Open
@zawata zawata force-pushed the libgit-1.3.0-update branch from 42faeed to 9e1649b Compare March 24, 2022 14:54
ianhattendorf
ianhattendorf requested changes Mar 24, 2022
View reviewed changes
Copy link
Member

@ianhattendorf ianhattendorf left a comment

Choose a reason for hiding this comment

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

Looking good, just a few things to address.

ianhattendorf
ianhattendorf reviewed Mar 24, 2022
View reviewed changes
AlexaXs
AlexaXs reviewed Mar 28, 2022
View reviewed changes
Copy link
Contributor

@AlexaXs AlexaXs left a comment

Choose a reason for hiding this comment

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

Changes in vendor/libgit2 look good. Merged changes onto libgit2-1.3.0 maintain the original code semantics.

@zawata zawata force-pushed the libgit-1.3.0-update branch from 0acfe03 to f7d63bb Compare April 4, 2022 17:02
@zawata zawata requested a review from ianhattendorf April 5, 2022 22:34
@zawata zawata force-pushed the libgit-1.3.0-update branch 3 times, most recently from 00daf09 to 8b41a6a Compare April 5, 2022 23:41
@wmertens
Copy link
Contributor

wmertens commented Apr 6, 2022

In the meantime libgit 1.4.2 is out, would that be an easy upgrade?

@zawata
Copy link
Contributor Author

zawata commented Apr 6, 2022

@wmertens when I started this 1.4 had just come out and we decided to make changes incrememental rather than large(r) version jumps to help with API stabilization and minimize implementation problems. I do have the 1.4 upgrade in my backlog but I think theres some higher priority tasks to get done first(at least from my end) like filter streaming.

The actual upgrade to 1.4 doesn't look super complex but i wouldn't no for certain until I start working on it.

ianhattendorf
ianhattendorf reviewed Apr 8, 2022
View reviewed changes
@zawata
Copy link
Contributor Author

zawata commented Apr 13, 2022

In light of the recent libgit2 security release, I'll update this PR to use libgit 1.3.1. Luckily this won't require any code or libgit2-docs changes. I've already confirmed it builds.

@ianhattendorf I've updated my fork of the libgit-next branch. Please push it when convenient and I'll update the submodule in this PR. https://github.com/zawata/libgit2/tree/libgit-next

@zawata zawata changed the title Upgrade libgit2 to 1.3.0 Upgrade libgit2 to 1.3.1 Apr 15, 2022
@zawata
Copy link
Contributor Author

zawata commented Apr 15, 2022 •
edited
Loading

PR updated to libgit2 v1.3.1

@zawata zawata force-pushed the libgit-1.3.0-update branch from df309c1 to 8a48d37 Compare April 19, 2022 16:23
@zawata zawata requested a review from ianhattendorf April 22, 2022 17:51
@zawata zawata force-pushed the libgit-1.3.0-update branch from 5ba1a66 to 4ecc785 Compare April 22, 2022 18:57
@ianhattendorf ianhattendorf merged commit f8be27a into nodegit:master Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ianhattendorf ianhattendorf ianhattendorf approved these changes

+1 more reviewer

@AlexaXs AlexaXs AlexaXs left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zawata @wmertens @ianhattendorf @AlexaXs