Update libgit2 to 2ca088b

.travis.yml

@@ -3,7 +3,7 @@
 
 language: csharp
 mono:
- - latest
+ - 4.8.0
 
 os:
  - osx

LibGit2Sharp.Tests/CheckoutFixture.cs

@@ -97,7 +97,7 @@ public void CanCheckoutAnExistingBranchByName(string branchName)
 
         [Theory]
         [InlineData("6dcf9bf", true, "6dcf9bf")]
-        [InlineData("refs/tags/lw", true, "refs/tags/lw")]
+        [InlineData("refs/tags/lw", true, "lw")]
         [InlineData("HEAD~2", true, "HEAD~2")]
         [InlineData("6dcf9bf", false, "6dcf9bf7541ee10456529833502442f385010c3d")]
         [InlineData("refs/tags/lw", false, "e90810b8df3e80c413d903f631643c716887138d")]
@@ -748,7 +748,7 @@ public void CheckingOutABranchDoesNotAlterBinaryFiles()
 
         [Theory]
         [InlineData("a447ba2ca8")]
-        [InlineData("refs/tags/lw")]
+        [InlineData("lw")]
         [InlineData("e90810^{}")]
         public void CheckoutFromDetachedHead(string commitPointer)
         {

LibGit2Sharp.Tests/OdbBackendFixture.cs

@@ -90,37 +90,46 @@ public void CanGeneratePredictableObjectShasWithAProvidedBackend()
         [Fact]
         public void CanRetrieveObjectsThroughOddSizedShortShas()
         {
-            string repoPath = InitNewRepository();
-
-            using (var repo = new Repository(repoPath))
+            try
             {
-                var backend = new MockOdbBackend();
-                repo.ObjectDatabase.AddBackend(backend, priority: 5);
+                GlobalSettings.SetStrictHashVerification(false);
 
-                AddCommitToRepo(repo);
+                string repoPath = InitNewRepository();
 
-                var blob1 = repo.Lookup<Blob>("9daeaf");
-                Assert.NotNull(blob1);
+                using (var repo = new Repository(repoPath))
+                {
+                    var backend = new MockOdbBackend();
+                    repo.ObjectDatabase.AddBackend(backend, priority: 5);
 
-                const string dummy = "dummy\n";
+                    AddCommitToRepo(repo);
 
-                // Inserts a fake blob with a similarly prefixed sha
-                var fakeId = new ObjectId("9daeaf0000000000000000000000000000000000");
-                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(dummy)))
-                {
-                    Assert.Equal(0, backend.Write(fakeId, ms, dummy.Length, ObjectType.Blob));
-                }
+                    var blob1 = repo.Lookup<Blob>("9daeaf");
+                    Assert.NotNull(blob1);
+
+                    const string dummy = "dummy\n";
+
+                    // Inserts a fake blob with a similarly prefixed sha
+                    var fakeId = new ObjectId("9daeaf0000000000000000000000000000000000");
+                    using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(dummy)))
+                    {
+                        Assert.Equal(0, backend.Write(fakeId, ms, dummy.Length, ObjectType.Blob));
+                    }
 
-                var blob2 = repo.Lookup<Blob>(fakeId);
-                Assert.NotNull(blob2);
+                    var blob2 = repo.Lookup<Blob>(fakeId);
+                    Assert.NotNull(blob2);
 
-                Assert.Throws<AmbiguousSpecificationException>(() => repo.Lookup<Blob>("9daeaf"));
+                    Assert.Throws<AmbiguousSpecificationException>(() => repo.Lookup<Blob>("9daeaf"));
 
-                var newBlob1 = repo.Lookup("9daeafb");
-                var newBlob2 = repo.Lookup("9daeaf0");
+                    var newBlob1 = repo.Lookup("9daeafb");
+                    var newBlob2 = repo.Lookup("9daeaf0");
 
-                Assert.Equal(blob1, newBlob1);
-                Assert.Equal(blob2, newBlob2);
+                    Assert.Equal(blob1, newBlob1);
+                    Assert.Equal(blob2, newBlob2);
+                }
+            }
+            finally
+            {
+                GlobalSettings.SetStrictHashVerification(true);
             }
         }
 

LibGit2Sharp/Core/GitErrorCategory.cs

@@ -34,6 +34,8 @@ internal enum GitErrorCategory
         Describe,
         Rebase,
         Filesystem,
-        Patch
+        Patch,
+        Worktree,
+        Sha1
     }
 }

LibGit2Sharp/Core/GitErrorCode.cs

@@ -125,5 +125,15 @@ internal enum GitErrorCode
         /// There are no more entries left to iterate.
         /// </summary>
         IterOver = -31,
+
+        /// <summary>
+        /// Internal-only.
+        /// </summary>
+        Retry = -32,
+
+        /// <summary>
+        /// A retrieved object did not match its expected ID.
+        /// </summary>
+        Mismatch = -33,
     }
 }

LibGit2Sharp/Core/NativeMethods.cs

@@ -636,6 +636,9 @@ internal static extern int git_filter_unregister(
         internal static extern int git_libgit2_opts(int option, uint level,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))]string path);
 
+        // git_libgit2_opts(GIT_OPT_ENABLE_*, int enabled)
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int git_libgit2_opts(int option, int enabled);
         #endregion
 
         [DllImport(libgit2)]

LibGit2Sharp/Core/Proxy.cs

@@ -3345,25 +3345,31 @@ public static BuiltInFeatures git_libgit2_features()
         }
 
         // C# equivalent of libgit2's git_libgit2_opt_t
-        private enum LibGitOption
-        {
-            GetMWindowSize,             // GIT_OPT_GET_MWINDOW_SIZE
-            SetMWindowSize,             // GIT_OPT_SET_MWINDOW_SIZE
-            GetMWindowMappedLimit,      // GIT_OPT_GET_MWINDOW_MAPPED_LIMIT
-            SetMWindowMappedLimit,      // GIT_OPT_SET_MWINDOW_MAPPED_LIMIT
-            GetSearchPath,              // GIT_OPT_GET_SEARCH_PATH
-            SetSearchPath,              // GIT_OPT_SET_SEARCH_PATH
-            SetCacheObjectLimit,        // GIT_OPT_SET_CACHE_OBJECT_LIMIT
-            SetCacheMaxSize,            // GIT_OPT_SET_CACHE_MAX_SIZE
-            EnableCaching,              // GIT_OPT_ENABLE_CACHING
-            GetCachedMemory,            // GIT_OPT_GET_CACHED_MEMORY
-            GetTemplatePath,            // GIT_OPT_GET_TEMPLATE_PATH
-            SetTemplatePath,            // GIT_OPT_SET_TEMPLATE_PATH
-            SetSslCertLocations,        // GIT_OPT_SET_SSL_CERT_LOCATIONS
-            SetUserAgent,               // GIT_OPT_SET_USER_AGENT
-            EnableStrictObjectCreation, // GIT_OPT_ENABLE_STRICT_OBJECT_CREATION
-            SetSslCiphers,              // GIT_OPT_SET_SSL_CIPHERS
-            GetUserAgent,               // GIT_OPT_GET_USER_AGENT
+        private enum LibGit2Option
+        {
+            GetMWindowSize,                  // GIT_OPT_GET_MWINDOW_SIZE
+            SetMWindowSize,                  // GIT_OPT_SET_MWINDOW_SIZE
+            GetMWindowMappedLimit,           // GIT_OPT_GET_MWINDOW_MAPPED_LIMIT
+            SetMWindowMappedLimit,           // GIT_OPT_SET_MWINDOW_MAPPED_LIMIT
+            GetSearchPath,                   // GIT_OPT_GET_SEARCH_PATH
+            SetSearchPath,                   // GIT_OPT_SET_SEARCH_PATH
+            SetCacheObjectLimit,             // GIT_OPT_SET_CACHE_OBJECT_LIMIT
+            SetCacheMaxSize,                 // GIT_OPT_SET_CACHE_MAX_SIZE
+            EnableCaching,                   // GIT_OPT_ENABLE_CACHING
+            GetCachedMemory,                 // GIT_OPT_GET_CACHED_MEMORY
+            GetTemplatePath,                 // GIT_OPT_GET_TEMPLATE_PATH
+            SetTemplatePath,                 // GIT_OPT_SET_TEMPLATE_PATH
+            SetSslCertLocations,             // GIT_OPT_SET_SSL_CERT_LOCATIONS
+            SetUserAgent,                    // GIT_OPT_SET_USER_AGENT
+            EnableStrictObjectCreation,      // GIT_OPT_ENABLE_STRICT_OBJECT_CREATION
+            EnableStrictSymbolicRefCreation, // GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION
+            SetSslCiphers,                   // GIT_OPT_SET_SSL_CIPHERS
+            GetUserAgent,                    // GIT_OPT_GET_USER_AGENT
+            EnableOfsDelta,                  // GIT_OPT_ENABLE_OFS_DELTA
+            EnableFsyncGitdir,               // GIT_OPT_ENABLE_FSYNC_GITDIR
+            GetWindowsSharemode,             // GIT_OPT_GET_WINDOWS_SHAREMODE
+            SetWindowsSharemode,             // GIT_OPT_SET_WINDOWS_SHAREMODE
+            EnableStrictHashVerification,    // GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION
         }
 
         /// <summary>
@@ -3379,7 +3385,7 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
 
             using (var buf = new GitBuf())
             {
-                var res = NativeMethods.git_libgit2_opts((int)LibGitOption.GetSearchPath, (uint)level, buf);
+                var res = NativeMethods.git_libgit2_opts((int)LibGit2Option.GetSearchPath, (uint)level, buf);
                 Ensure.ZeroResult(res);
 
                 path = LaxUtf8Marshaler.FromNative(buf.ptr) ?? string.Empty;
@@ -3388,6 +3394,11 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
             return path;
         }
 
+        public static void git_libgit2_opts_enable_strict_hash_verification(bool enabled)
+        {
+            NativeMethods.git_libgit2_opts((int)LibGit2Option.EnableStrictHashVerification, enabled ? 1 : 0);
+        }
+
         /// <summary>
         /// Set the path(s) under which libgit2 searches for the configuration file of a given level.
         /// </summary>
@@ -3398,7 +3409,7 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
         /// </param>
         public static void git_libgit2_opts_set_search_path(ConfigurationLevel level, string path)
         {
-            var res = NativeMethods.git_libgit2_opts((int)LibGitOption.SetSearchPath, (uint)level, path);
+            var res = NativeMethods.git_libgit2_opts((int)LibGit2Option.SetSearchPath, (uint)level, path);
             Ensure.ZeroResult(res);
         }
 

LibGit2Sharp/GlobalSettings.cs

@@ -318,5 +318,10 @@ public static void SetConfigSearchPaths(ConfigurationLevel level, params string[
             var pathString = (paths == null) ? null : string.Join(Path.PathSeparator.ToString(), paths);
             Proxy.git_libgit2_opts_set_search_path(level, pathString);
         }
+
+        public static void SetStrictHashVerification(bool enabled)
+        {
+            Proxy.git_libgit2_opts_enable_strict_hash_verification(enabled);
+        }
     }
 }

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.165\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.165\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.183\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.183\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -392,6 +392,6 @@
     <PropertyGroup>
       <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.165\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.165\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.183\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.183\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
-</Project>
+</Project>

LibGit2Sharp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.165" targetFramework="net40" allowedVersions="[1.0.165]" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.183" targetFramework="net40" allowedVersions="[1.0.183]" />
 </packages>