Skip to content

feat: merge upstream#18

Merged
llimllib merged 52 commits intomasterfrom
merge-libgit-191
Nov 8, 2025
Merged

feat: merge upstream#18
llimllib merged 52 commits intomasterfrom
merge-libgit-191

Conversation

@llimllib
Copy link

@llimllib llimllib commented Nov 7, 2025

🧰 Changes

  • upgrade libgit2 from 1.8.4 to 1.9.1 (via the nodegit forked implementation)
  • remove the zlib patches that were necessary in feat: support node 22 #14
    • the updated libgit2 makes these no longer required to build

Maintenance note: I chose to bring in all the upstream history, with the intent to merge it without squashing so that git knows where we are relative to upstream. This ought to make it easier for me to merge upstream in the future

This PR will bring in a bunch of commits, but only actually merges the diff between https://github.com/nodegit/nodegit/tree/51650c7b4b7d65b35c80d4c62ead63072c54fbcc and https://github.com/nodegit/nodegit/tree/b9f3d16b61762e2ab24b9af10b821468ffe257b0 (view the diff here)

serggl and others added 30 commits February 3, 2025 17:25
c++20 got stricter with it's requirements for aggregate initialization I guess, and these structs are POD so there should be no point in specifying any constructors at all
…stics()

git_reference_target just returns a pointer to the git_reference's oid, it does not clone it so freeing the reference then wipes the oid
Bump @axosoft/nan and add ability to compile for c++20
necessary until node23 for building on newere versions of v8
git_errror_last will now return a "no-error" object instead of returning a null pointer
fix dependency graph
@llimllib llimllib mentioned this pull request Nov 7, 2025
8 tasks
@llimllib llimllib requested a review from erunion November 7, 2025 22:20
.then(function() {
if (buildFlags.isGitRepo) {
var submodules = require(local("submodules"));
var applyPatches = require(local("patches/applyPatches"));
Copy link
Author

Choose a reason for hiding this comment

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

This is the process that was necessary to support building zlib on mac, which is no longer needed with the libgit2 upgrade

@llimllib llimllib merged commit 57ed35d into master Nov 8, 2025
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants