fixup! Update libgit2 to ff8d635

Author: nulltoken

LibGit2Sharp.Tests/FetchFixture.cs

@@ -135,12 +135,13 @@ public void CanFetchCustomRefSpecsIntoAnEmptyRepository(string url, string local
                 expectedFetchState.AddExpectedBranch(localBranchName, ObjectId.Zero, remoteInfo.BranchTips[remoteBranchName]);
 
                 // Let's account for opportunistic updates during the Fetch() call
-                if (localBranchName != "master")
+                if (!string.Equals("master", localBranchName, StringComparison.OrdinalIgnoreCase))
                 {
                     expectedFetchState.AddExpectedBranch("master", ObjectId.Zero, remoteInfo.BranchTips["master"]);
                 }
 
-                if (localBranchName == "master" && remoteBranchName != "master")
+                if (string.Equals("master", localBranchName, StringComparison.OrdinalIgnoreCase)
+                    && !string.Equals("master", remoteBranchName, StringComparison.OrdinalIgnoreCase))
                 {
                     expectedFetchState.AddExpectedBranch(remoteBranchName, ObjectId.Zero, remoteInfo.BranchTips[remoteBranchName]);
                 }

LibGit2Sharp/Core/FetchPruneStrategy.cs

@@ -8,8 +8,9 @@ internal enum FetchPruneStrategy
     {
         /// <summary>
         /// Use the setting from the configuration
+        /// or, when there isn't any, fallback to default behavior.
         /// </summary>
-        Fallback = 0,  // Default?
+        FromConfigurationOrDefault = 0,
 
         /// <summary>
         /// Force pruning on

LibGit2Sharp/Core/GitFetchOptions.cs

@@ -7,13 +7,8 @@ internal class GitFetchOptions
     {
         public int Version = 1;
         public GitRemoteCallbacks RemoteCallbacks;
-        public FetchPruneStrategy prune;
-        public bool update_fetchhead = true;
+        public FetchPruneStrategy Prune;
+        public bool UpdateFetchHead = true;
         public TagFetchMode download_tags;
-
-        public GitFetchOptions()
-        {
-            download_tags = TagFetchMode.Auto;
-        }
     }
 }

LibGit2Sharp/Core/GitMergeOpts.cs

@@ -32,7 +32,10 @@ internal struct GitMergeOpts
         /// </summary>
         public MergeFileFavor MergeFileFavorFlags;
 
-        public GitMergeFileFlags file_flags;
+        /// <summary>
+        /// File merging flags.
+        /// </summary>
+        public GitMergeFileFlags FileFlags;
     }
 
     /// <summary>

LibGit2Sharp/Core/NativeMethods.cs

@@ -274,7 +274,7 @@ internal static extern int git_commit_create_from_ids(
         [DllImport(libgit2)]
         internal static extern int git_config_delete_entry(
             ConfigurationSafeHandle cfg,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof (StrictUtf8Marshaler))] string name);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
 
         [DllImport(libgit2)]
         internal static extern int git_config_delete_multivar(

LibGit2Sharp/Core/Proxy.cs

@@ -472,11 +472,13 @@ public static bool git_config_delete(ConfigurationSafeHandle config, string name
             }
         }
 
+        const string anyValue = ".*";
+
         public static bool git_config_delete_multivar(ConfigurationSafeHandle config, string name)
         {
             using (ThreadAffinity())
             {
-                int res = NativeMethods.git_config_delete_multivar(config, name, ".*");
+                int res = NativeMethods.git_config_delete_multivar(config, name, anyValue);
 
                 if (res == (int)GitErrorCode.NotFound)
                 {

LibGit2Sharp/Network.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Security.Policy;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 using LibGit2Sharp.Handlers;
@@ -108,7 +107,7 @@ public virtual IEnumerable<DirectReference> ListReferences(string url)
             }
         }
 
-        static RemoteSafeHandle Build(RepositorySafeHandle repoHandle, Remote remote, string url)
+        static RemoteSafeHandle BuildRemoteSafeHandle(RepositorySafeHandle repoHandle, Remote remote, string url)
         {
             Debug.Assert((remote == null) ^ (url == null));
 
@@ -135,7 +134,7 @@ static void DoFetch(RepositorySafeHandle repoHandle, Remote remote, string url,
                 options = new FetchOptions();
             }
 
-            using (RemoteSafeHandle remoteHandle = Build(repoHandle, remote, url))
+            using (RemoteSafeHandle remoteHandle = BuildRemoteSafeHandle(repoHandle, remote, url))
             {
                 var callbacks = new RemoteCallbacks(options);
                 GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks();

LibGit2Sharp/TagFetchMode.cs

@@ -7,11 +7,10 @@
     public enum TagFetchMode
     {
         /// <summary>
-        /// Use the setting from the configuration.
+        /// Use the setting from the configuration
+        /// or, when there isn't any, fallback to default behavior.
         /// </summary>
-        Fallback = 0,  // GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK
-
-
+        FromConfigurationOrDefault = 0,  // GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK
 
         /// <summary>
         /// Will automatically retrieve tags that