Merge pull request #50 from libgit2/ethomson/update_libgit2

Update libgit2 to bd69280

Author: ethomson

.travis.yml

@@ -1,3 +1,6 @@
+git:
+ submodules: false
+
 language: c
 
 os:
@@ -12,6 +15,7 @@ before_install:
  - date -u
  - uname -a
  - env | grep -v "BINTRAY_API_KEY" | sort
+ - git submodule update --init
 
 install: true
 

appveyor.yml

@@ -7,7 +7,7 @@ branches:
 skip_tags: true
 
 install:
-- git submodule update --init --recursive
+- git submodule update --init
 
 build_script:
 - ps: .\build.libgit2.ps1 -vs 12

libgit2

@@ -5,28 +5,28 @@
         <EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
     </ItemGroup>
     <ItemGroup>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-1196807.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-1196807.dll">
-            <Link>lib\win32\x64\git2-1196807.dll</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-bd69280.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-bd69280.dll">
+            <Link>lib\win32\x64\git2-bd69280.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-1196807.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-1196807.pdb">
-            <Link>lib\win32\x64\git2-1196807.pdb</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-bd69280.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-bd69280.pdb">
+            <Link>lib\win32\x64\git2-bd69280.pdb</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-1196807.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-1196807.dll">
-            <Link>lib\win32\x86\git2-1196807.dll</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-bd69280.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-bd69280.dll">
+            <Link>lib\win32\x86\git2-bd69280.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-1196807.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-1196807.pdb">
-            <Link>lib\win32\x86\git2-1196807.pdb</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-bd69280.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-bd69280.pdb">
+            <Link>lib\win32\x86\git2-bd69280.pdb</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-1196807.dylib')" Include="$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-1196807.dylib">
-            <Link>lib\osx\libgit2-1196807.dylib</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-bd69280.dylib')" Include="$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-bd69280.dylib">
+            <Link>lib\osx\libgit2-bd69280.dylib</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-1196807.so')" Include="$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-1196807.so">
-            <Link>lib\linux\x86_64\libgit2-1196807.so</Link>
+        <None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-bd69280.so')" Include="$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-bd69280.so">
+            <Link>lib\linux\x86_64\libgit2-bd69280.so</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">

nuget.package/build/LibGit2Sharp.NativeBinaries.props

@@ -1,4 +1,4 @@
 <configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-1196807" target="lib/linux/x86_64/libgit2-1196807.so" />
-    <dllmap os="osx" cpu="x86,x86-64" dll="git2-1196807" target="lib/osx/libgit2-1196807.dylib" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-bd69280" target="lib/linux/x86_64/libgit2-bd69280.so" />
+    <dllmap os="osx" cpu="x86,x86-64" dll="git2-bd69280" target="lib/osx/libgit2-bd69280.dylib" />
 </configuration>

nuget.package/libgit2/LibGit2Sharp.dll.config

@@ -1 +1 @@
-git2-1196807
+git2-bd69280

nuget.package/libgit2/libgit2_filename.txt

@@ -1 +1 @@
-1196807380b73f202bc1fea3045e13b719a465e9
+bd6928096d7a4c8f26b55a1e9ec710faeee7db93