From 2a657587db16aa2ae954c6e6c21c71c4a26b0c1b Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Fri, 1 Apr 2022 17:28:37 -0400
Subject: [PATCH 1/2] Update libgit2 to 1.4.2

---
 libgit2                                              |  2 +-
 .../build/LibGit2Sharp.NativeBinaries.props          |  6 +++---
 .../build/net46/LibGit2Sharp.NativeBinaries.props    |  6 +++---
 nuget.package/libgit2/LibGit2Sharp.dll.config        | 12 ++++++------
 nuget.package/libgit2/libgit2_hash.txt               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libgit2 b/libgit2
index b7bad55e..182d0d1e 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
+Subproject commit 182d0d1ee933de46bf0b5a6ec269bafa77aba9a2
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
index 9c9432c1..5aac25a0 100644
--- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
@@ -1,7 +1,7 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>b7bad55e4bb0a285b073ba5e02b01d3f522fc95d</libgit2_hash>
-    <libgit2_filename>git2-b7bad55</libgit2_filename>
+    <libgit2_hash>182d0d1ee933de46bf0b5a6ec269bafa77aba9a2</libgit2_hash>
+    <libgit2_filename>git2-182d0d1</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
index 62811535..ed4696fe 100644
--- a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
@@ -1,8 +1,8 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>b7bad55e4bb0a285b073ba5e02b01d3f522fc95d</libgit2_hash>
-    <libgit2_filename>git2-b7bad55</libgit2_filename>
+    <libgit2_hash>182d0d1ee933de46bf0b5a6ec269bafa77aba9a2</libgit2_hash>
+    <libgit2_filename>git2-182d0d1</libgit2_filename>
   </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
index 9dd995d9..1793d0dc 100644
--- a/nuget.package/libgit2/LibGit2Sharp.dll.config
+++ b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,7 +1,7 @@
-<configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-b7bad55" target="lib/linux-x64/libgit2-b7bad55.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-b7bad55" target="lib/linux-arm/libgit2-b7bad55.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-b7bad55" target="lib/linux-arm64/libgit2-b7bad55.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-b7bad55" target="lib/osx-x64/libgit2-b7bad55.dylib" />
-    <dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-b7bad55" target="lib/osx-arm64/libgit2-b7bad55.dylib" />
+<configuration>
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-182d0d1" target="lib/linux-x64/libgit2-182d0d1.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-182d0d1" target="lib/linux-arm/libgit2-182d0d1.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-182d0d1" target="lib/linux-arm64/libgit2-182d0d1.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-182d0d1" target="lib/osx-x64/libgit2-182d0d1.dylib" />
+    <dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-182d0d1" target="lib/osx-arm64/libgit2-182d0d1.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index e6de7a27..02ed8d00 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
+182d0d1ee933de46bf0b5a6ec269bafa77aba9a2

From ce3657a8a5eea23bd5792c3f9cb883c10ee569d7 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Tue, 15 Feb 2022 17:30:32 -0500
Subject: [PATCH 2/2] Update build script for cmake changes

---
 build.libgit2.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.libgit2.sh b/build.libgit2.sh
index 81fb9914..2f02ae54 100755
--- a/build.libgit2.sh
+++ b/build.libgit2.sh
@@ -27,9 +27,8 @@ pushd libgit2/build
 export _BINPATH=`pwd`
 
 cmake -DCMAKE_BUILD_TYPE:STRING=Release \
-      -DBUILD_CLAR:BOOL=OFF \
+      -DBUILD_TESTS:BOOL=OFF \
       -DUSE_SSH=OFF \
-      -DENABLE_TRACE=ON \
       -DLIBGIT2_FILENAME=git2-$SHORTSHA \
       -DCMAKE_OSX_ARCHITECTURES=$OSXARCHITECTURE \
       -DUSE_HTTPS=$USEHTTPS \