Merge pull request #2131 from libgit2/libgit2-184

Update LibGit2Sharp.NativeBinaries to 2.0.323

LibGit2Sharp.Tests/CloneFixture.cs

@@ -36,9 +36,9 @@ public void CanClone(string url)
         }
 
         [Theory]
-        [InlineData("https://github.com/libgit2/TestGitRepository",1)]
-        [InlineData("https://github.com/libgit2/TestGitRepository",5)]
-        [InlineData("https://github.com/libgit2/TestGitRepository",7)]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 1)]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 5)]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 7)]
         public void CanCloneShallow(string url, int depth)
         {
             var scd = BuildSelfCleaningDirectory();
@@ -266,7 +266,7 @@ static Credentials CreateUsernamePasswordCredentials(string user, string pass, b
 
         [SkippableTheory]
         [InlineData("https://github.com/libgit2/TestGitRepository.git", "github.com", typeof(CertificateX509))]
-        [InlineData("[email protected]:libgit2/TestGitRepository.git", "github.com", typeof(CertificateSsh))]
+        //[InlineData("[email protected]:libgit2/TestGitRepository.git", "github.com", typeof(CertificateSsh))]
         public void CanInspectCertificateOnClone(string url, string hostname, Type certType)
         {
             var scd = BuildSelfCleaningDirectory();

LibGit2Sharp.Tests/GlobalSettingsFixture.cs

@@ -90,17 +90,17 @@ public void SetExtensions()
             var extensions = GlobalSettings.GetExtensions();
 
             // Assert that "noop" is supported by default
-            Assert.Equal(new[] { "noop", "objectformat" }, extensions);
+            Assert.Equal(new[] { "noop", "objectformat", "worktreeconfig" }, extensions);
 
             // Disable "noop" extensions
             GlobalSettings.SetExtensions("!noop");
             extensions = GlobalSettings.GetExtensions();
-            Assert.Equal(new[] { "objectformat" }, extensions);
+            Assert.Equal(new[] { "objectformat", "worktreeconfig" }, extensions);
 
             // Enable two new extensions (it will reset the configuration and "noop" will be enabled)
             GlobalSettings.SetExtensions("partialclone", "newext");
             extensions = GlobalSettings.GetExtensions();
-            Assert.Equal(new[] { "newext", "noop", "objectformat", "partialclone" }, extensions);
+            Assert.Equal(new[] { "newext", "noop", "objectformat", "partialclone", "worktreeconfig" }, extensions);
         }
     }
 }

LibGit2Sharp/ConfigurationLevel.cs

@@ -5,6 +5,11 @@
     /// </summary>
     public enum ConfigurationLevel
     {
+        /// <summary>
+        /// Worktree specific configuration file; $GIT_DIR/config.worktree
+        /// </summary>
+        Worktree = 6,
+
         /// <summary>
         /// The local .git/config of the current repository.
         /// </summary>

LibGit2Sharp/Core/GitConfigEntry.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 
 namespace LibGit2Sharp.Core
@@ -8,9 +7,10 @@ internal unsafe struct GitConfigEntry
     {
         public char* namePtr;
         public char* valuePtr;
+        public char* backend_type;
+        public char* origin_path;
         public uint include_depth;
         public uint level;
         public void* freePtr;
-        public void* payloadPtr;
     }
 }

LibGit2Sharp/Core/GitPushOptions.cs

@@ -11,5 +11,6 @@ internal class GitPushOptions
         public GitProxyOptions ProxyOptions;
         public RemoteRedirectMode FollowRedirects = RemoteRedirectMode.Initial;
         public GitStrArrayManaged CustomHeaders;
+        public GitStrArrayManaged remote_push_options;
     }
 }

LibGit2Sharp/Core/GitWorktree.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace LibGit2Sharp.Core
 {
@@ -36,6 +34,8 @@ internal class git_worktree_add_options
 
         public int locked;
 
+        public int checkout_existing;
+
         public IntPtr @ref = IntPtr.Zero;
 
         public GitCheckoutOpts checkoutOpts = new GitCheckoutOpts { version = 1 };

LibGit2Sharp/LibGit2Sharp.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.323]" PrivateAssets="none" />
     <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 

LibGit2Sharp/WorktreeCollection.cs

@@ -1,12 +1,10 @@
-using LibGit2Sharp.Core;
-using LibGit2Sharp.Core.Handles;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Text;
+using LibGit2Sharp.Core;
+using LibGit2Sharp.Core.Handles;
 
 namespace LibGit2Sharp
 {
@@ -48,7 +46,7 @@ public virtual Worktree this[string name]
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="committishOrBranchSpec"></param>
         /// <param name="name"></param>
@@ -89,7 +87,7 @@ public virtual Worktree Add(string committishOrBranchSpec, string name, string p
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="name"></param>
         /// <param name="path"></param>
@@ -112,7 +110,7 @@ public virtual Worktree Add(string name, string path, bool isLocked)
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="worktree"></param>
         /// <returns></returns>
@@ -122,7 +120,7 @@ public virtual bool Prune(Worktree worktree)
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="worktree"></param>
         /// <param name="ifLocked"></param>