Merge pull request #1264 from libgit2/cmn/update-libgit2

Update to libgit2 68ad315

Author: carlosmn

LibGit2Sharp.Tests/NetworkFixture.cs

@@ -278,7 +278,7 @@ public void CanPruneRefs()
 
             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"]);

LibGit2Sharp/BlameHunk.cs

@@ -29,11 +29,11 @@ internal BlameHunk(IRepository repository, GitBlameHunk rawHunk)
             {
                 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)

LibGit2Sharp/BlameHunkCollection.cs

@@ -28,8 +28,8 @@ internal BlameHunkCollection(Repository repo, RepositorySafeHandle repoHandle, s
             {
                 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)

LibGit2Sharp/Core/GitBlame.cs

@@ -48,22 +48,22 @@ internal class GitBlameOptions
         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;

LibGit2Sharp/Core/GitRebaseOptions.cs

@@ -10,8 +10,12 @@ internal class GitRebaseOptions
 
         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 };
     }
 }

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.

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>