diff options
author | Carlos <cmn@dwim.me> | 2016-02-26 02:23:08 +0300 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-02-25 19:21:00 +0300 |
commit | 35e8fa728d3258391349eafacbe1975c428d930f (patch) | |
tree | cbc4ff53f725701965200705472b002a852b1646 | |
parent | cf6a3c5c712af24c47acad230abc2758d18f832b (diff) |
Update to libgit2 68ad315
-rw-r--r-- | LibGit2Sharp.Tests/NetworkFixture.cs | 2 | ||||
-rw-r--r-- | LibGit2Sharp/BlameHunk.cs | 6 | ||||
-rw-r--r-- | LibGit2Sharp/BlameHunkCollection.cs | 4 | ||||
-rw-r--r-- | LibGit2Sharp/Core/GitBlame.cs | 10 | ||||
-rw-r--r-- | LibGit2Sharp/Core/GitRebaseOptions.cs | 4 | ||||
-rw-r--r-- | LibGit2Sharp/LibGit2Sharp.csproj | 6 | ||||
-rw-r--r-- | LibGit2Sharp/packages.config | 2 |
7 files changed, 19 insertions, 15 deletions
diff --git a/LibGit2Sharp.Tests/NetworkFixture.cs b/LibGit2Sharp.Tests/NetworkFixture.cs index 53a44346..dd5350b5 100644 --- a/LibGit2Sharp.Tests/NetworkFixture.cs +++ b/LibGit2Sharp.Tests/NetworkFixture.cs @@ -278,7 +278,7 @@ namespace LibGit2Sharp.Tests using (var repo = new Repository(clonedRepoPath)) { - repo.Network.Remotes.Add("pruner", "file://" + clonedRepoPath2); + repo.Network.Remotes.Add("pruner", clonedRepoPath2); var remote = repo.Network.Remotes["pruner"]; repo.Network.Fetch(remote); Assert.NotNull(repo.Refs["refs/remotes/pruner/master"]); diff --git a/LibGit2Sharp/BlameHunk.cs b/LibGit2Sharp/BlameHunk.cs index 93d711c7..7f05a0b3 100644 --- a/LibGit2Sharp/BlameHunk.cs +++ b/LibGit2Sharp/BlameHunk.cs @@ -29,11 +29,11 @@ namespace LibGit2Sharp { InitialPath = LaxUtf8Marshaler.FromNative(rawHunk.OrigPath); } - LineCount = rawHunk.LinesInHunk; + LineCount = rawHunk.LinesInHunk.ConvertToInt(); // Libgit2's line numbers are 1-based - FinalStartLineNumber = rawHunk.FinalStartLineNumber - 1; - InitialStartLineNumber = rawHunk.OrigStartLineNumber - 1; + FinalStartLineNumber = rawHunk.FinalStartLineNumber.ConvertToInt() - 1; + InitialStartLineNumber = rawHunk.OrigStartLineNumber.ConvertToInt() - 1; // Signature objects need to have ownership of their native pointers if (rawHunk.FinalSignature != IntPtr.Zero) diff --git a/LibGit2Sharp/BlameHunkCollection.cs b/LibGit2Sharp/BlameHunkCollection.cs index 35b94552..ef647eb3 100644 --- a/LibGit2Sharp/BlameHunkCollection.cs +++ b/LibGit2Sharp/BlameHunkCollection.cs @@ -28,8 +28,8 @@ namespace LibGit2Sharp { version = 1, flags = options.Strategy.ToGitBlameOptionFlags(), - MinLine = (uint)options.MinLine, - MaxLine = (uint)options.MaxLine, + MinLine = new UIntPtr((uint)options.MinLine), + MaxLine = new UIntPtr((uint)options.MaxLine), }; if (options.StartingAt != null) diff --git a/LibGit2Sharp/Core/GitBlame.cs b/LibGit2Sharp/Core/GitBlame.cs index 9db27d25..b14632c4 100644 --- a/LibGit2Sharp/Core/GitBlame.cs +++ b/LibGit2Sharp/Core/GitBlame.cs @@ -48,22 +48,22 @@ namespace LibGit2Sharp.Core public UInt16 MinMatchCharacters; public GitOid NewestCommit; public GitOid OldestCommit; - public uint MinLine; - public uint MaxLine; + public UIntPtr MinLine; + public UIntPtr MaxLine; } [StructLayout(LayoutKind.Sequential)] internal class GitBlameHunk { - public ushort LinesInHunk; + public UIntPtr LinesInHunk; public GitOid FinalCommitId; - public ushort FinalStartLineNumber; + public UIntPtr FinalStartLineNumber; public IntPtr FinalSignature; public GitOid OrigCommitId; public IntPtr OrigPath; - public ushort OrigStartLineNumber; + public UIntPtr OrigStartLineNumber; public IntPtr OrigSignature; public byte Boundary; diff --git a/LibGit2Sharp/Core/GitRebaseOptions.cs b/LibGit2Sharp/Core/GitRebaseOptions.cs index 2a0a65e4..3ae4e0ed 100644 --- a/LibGit2Sharp/Core/GitRebaseOptions.cs +++ b/LibGit2Sharp/Core/GitRebaseOptions.cs @@ -10,8 +10,12 @@ namespace LibGit2Sharp.Core public int quiet; + public int inmemory; + public IntPtr rewrite_notes_ref; + public GitMergeOpts merge_options = new GitMergeOpts { Version = 1 }; + public GitCheckoutOpts checkout_options = new GitCheckoutOpts { version = 1 }; } } diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 187b4202..ee5e0c42 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props')" /> + <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.126\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.126\build\LibGit2Sharp.NativeBinaries.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -403,9 +403,9 @@ </PropertyGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props'))" /> + <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.126\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.126\build\LibGit2Sharp.NativeBinaries.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/LibGit2Sharp/packages.config b/LibGit2Sharp/packages.config index eb634dee..a5313aec 100644 --- a/LibGit2Sharp/packages.config +++ b/LibGit2Sharp/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="LibGit2Sharp.NativeBinaries" version="1.0.119" targetFramework="net4" allowedVersions="[1.0.119]" /> + <package id="LibGit2Sharp.NativeBinaries" version="1.0.126" targetFramework="net4" allowedVersions="[1.0.126]" /> </packages> |