Merge pull request #135 from libgit2/libgit2-update

bording · web-flow · commit 9469eab266ba · 2022-04-01T18:03:23.000-04:00
Update libgit2 to 1.4.2
diff --git 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 \
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
+182d0d1ee933de46bf0b5a6ec269bafa77aba9a2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b7bad55e4bb0a285b073ba5e02b01d3f522fc95d`
	`1`	`+182d0d1ee933de46bf0b5a6ec269bafa77aba9a2`