Skip to content

Update to 1609983 #34

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 4, 2016
Merged

Update to 1609983 #34

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 62 files
+2 −2 .travis.yml
+22 −1 CHANGELOG.md
+25 −8 CMakeLists.txt
+32 −0 CONVENTIONS.md
+6 −0 README.md
+11 −5 THREADING.md
+5 −1 appveyor.yml
+9 −0 include/git2/common.h
+1 −1 include/git2/sys/index.h
+3 −3 include/git2/version.h
+5 −1 script/cibuild.sh
+7 −0 script/user_nodefs.h
+37 −11 src/commit.c
+5 −0 src/common.h
+1 −1 src/crlf.c
+5 −1 src/diff_print.c
+16 −11 src/diff_tform.c
+8 −9 src/fileops.c
+3 −1 src/global.c
+39 −15 src/index.c
+26 −0 src/object.c
+23 −0 src/object.h
+12 −2 src/openssl_stream.c
+6 −6 src/pack-objects.c
+18 −1 src/pack.c
+1 −2 src/path.c
+78 −30 src/pool.c
+28 −0 src/pool.h
+5 −2 src/posix.c
+12 −10 src/rebase.c
+1 −2 src/refdb_fs.c
+1 −7 src/refs.c
+4 −4 src/refspec.c
+2 −2 src/remote.c
+1 −2 src/revwalk.c
+6 −0 src/settings.c
+14 −11 src/transports/smart_pkt.c
+16 −0 src/transports/ssh.c
+12 −0 src/transports/ssh.h
+3 −2 src/transports/winhttp.c
+16 −0 src/tree.c
+12 −0 src/unix/posix.h
+3 −0 src/win32/win32-compat.h
+7 −2 src/xdiff/xmerge.c
+106 −5 tests/commit/write.c
+6 −0 tests/core/pool.c
+1 −1 tests/diff/format_email.c
+4 −4 tests/diff/index.c
+5 −3 tests/diff/workdir.c
+84 −0 tests/index/add.c
+3 −0 tests/index/bypath.c
+3 −3 tests/index/cache.c
+13 −21 tests/index/conflicts.c
+7 −0 tests/index/filemodes.c
+9 −0 tests/index/nsec.c
+4 −0 tests/index/racy.c
+85 −13 tests/object/tree/write.c
+25 −2 tests/refs/create.c
+ − tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863
+ − tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46
+ − tests/resources/status/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf
+ − tests/resources/testrepo/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf
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-68ad315.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-68ad315.dll">
<Link>NativeBinaries\amd64\git2-68ad315.dll</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-68ad315.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-68ad315.pdb">
<Link>NativeBinaries\amd64\git2-68ad315.pdb</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-68ad315.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-68ad315.dll">
<Link>NativeBinaries\x86\git2-68ad315.dll</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-68ad315.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-68ad315.pdb">
<Link>NativeBinaries\x86\git2-68ad315.pdb</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-68ad315.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-68ad315.dylib">
<Link>NativeBinaries\osx\libgit2-68ad315.dylib</Link>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-785d8c4.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-785d8c4.dylib">
<Link>NativeBinaries\osx\libgit2-785d8c4.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-68ad315.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-68ad315.so">
<Link>NativeBinaries\linux\amd64\libgit2-68ad315.so</Link>
<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>
<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-68ad315" target="NativeBinaries/linux/amd64/libgit2-68ad315.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-68ad315" target="NativeBinaries/osx/libgit2-68ad315.dylib" />
<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" />
</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-68ad315
git2-785d8c4
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 @@
68ad3156a03202d9f5be9d45e935ead3047fc97a
785d8c48ea8725691da3c50e7dae8751523d4c30