Skip to content

Update to de143ef #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2016
Merged

Update to de143ef #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libgit2
Open in desktop
Submodule libgit2 updated 53 files
+0 −3 .travis.yml
+3 −0 CHANGELOG.md
+1 −1 CMakeLists.txt
+1 −6 appveyor.yml
+5 −2 deps/http-parser/http_parser.c
+2 −3 examples/general.c
+46 −0 include/git2/commit.h
+8 −1 include/git2/common.h
+47 −1 include/git2/odb.h
+1 −3 script/appveyor-mingw.sh
+16 −2 script/coverity.sh
+0 −13 script/toolchain-mingw32.cmake
+8 −3 src/blame.c
+2 −1 src/blame_git.c
+128 −47 src/commit.c
+2 −1 src/config_cache.c
+25 −8 src/config_file.c
+2 −1 src/describe.c
+5 −3 src/diff_tform.c
+6 −1 src/filebuf.c
+2 −0 src/global.c
+1 −0 src/global.h
+9 −3 src/index.c
+4 −4 src/indexer.c
+12 −2 src/mwindow.c
+3 −6 src/object.c
+197 −61 src/odb.c
+2 −1 src/odb.h
+12 −8 src/odb_loose.c
+5 −3 src/odb_pack.c
+9 −0 src/oid.h
+13 −0 src/openssl_stream.c
+3 −1 src/pack-objects.c
+5 −5 src/pack.c
+7 −0 src/posix.c
+1 −0 src/posix.h
+1 −0 src/refdb_fs.c
+23 −1 src/settings.c
+2 −1 src/submodule.c
+2 −0 src/transport.c
+32 −17 src/transports/ssh.c
+5 −0 src/unix/map.c
+24 −5 src/win32/map.c
+39 −0 tests/commit/write.c
+51 −9 tests/index/nsec.c
+12 −19 tests/index/racy.c
+2 −2 tests/merge/workdir/dirty.c
+155 −0 tests/odb/mixed.c
+8 −0 tests/online/badssl.c
+26 −5 tests/rebase/abort.c
+57 −0 tests/rebase/merge.c
+205 −0 tests/rebase/setup.c
+10 −0 tests/transport/register.c
24 changes: 12 additions & 12 deletions nuget.package/build/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
</ItemGroup>
<ItemGroup>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-785d8c4.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-785d8c4.dll">
<Link>NativeBinaries\amd64\git2-785d8c4.dll</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.dll">
<Link>NativeBinaries\amd64\git2-de143ef.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-785d8c4.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-785d8c4.pdb">
<Link>NativeBinaries\amd64\git2-785d8c4.pdb</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.pdb">
<Link>NativeBinaries\amd64\git2-de143ef.pdb</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-785d8c4.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-785d8c4.dll">
<Link>NativeBinaries\x86\git2-785d8c4.dll</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.dll">
<Link>NativeBinaries\x86\git2-de143ef.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-785d8c4.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-785d8c4.pdb">
<Link>NativeBinaries\x86\git2-785d8c4.pdb</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.pdb">
<Link>NativeBinaries\x86\git2-de143ef.pdb</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-785d8c4.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-785d8c4.dylib">
<Link>NativeBinaries\osx\libgit2-785d8c4.dylib</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-de143ef.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-de143ef.dylib">
<Link>NativeBinaries\osx\libgit2-de143ef.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-785d8c4.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-785d8c4.so">
<Link>NativeBinaries\linux\amd64\libgit2-785d8c4.so</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-de143ef.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-de143ef.so">
<Link>NativeBinaries\linux\amd64\libgit2-de143ef.so</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
Expand Down
4 changes: 2 additions & 2 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<configuration>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-785d8c4" target="NativeBinaries/linux/amd64/libgit2-785d8c4.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-785d8c4" target="NativeBinaries/osx/libgit2-785d8c4.dylib" />
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-de143ef" target="NativeBinaries/linux/amd64/libgit2-de143ef.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-de143ef" target="NativeBinaries/osx/libgit2-de143ef.dylib" />
</configuration>
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_filename.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git2-785d8c4
git2-de143ef
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
785d8c48ea8725691da3c50e7dae8751523d4c30
de143efa88f6916af62cc5ed172e9cae4b194ae1