From 88cf9a7b8f1732ae8a2953816895989bb2ae9403 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@github.com>
Date: Wed, 3 Aug 2016 22:40:57 -0400
Subject: [PATCH] Update libgit2 natives to 1.0.160

---
 LibGit2Sharp/Commands/Fetch.cs           |  2 ++
 LibGit2Sharp/Core/GitDiff.cs             |  1 +
 LibGit2Sharp/Core/GitErrorCategory.cs    |  1 +
 LibGit2Sharp/Core/GitFetchOptions.cs     |  1 +
 LibGit2Sharp/Core/GitProxyOptions.cs     | 23 ++++++++++++++
 LibGit2Sharp/Core/GitPushOptions.cs      |  1 +
 LibGit2Sharp/Core/GitSubmoduleOptions.cs |  4 ++-
 LibGit2Sharp/Core/NativeMethods.cs       | 20 +++---------
 LibGit2Sharp/Core/Proxy.cs               | 40 +++++++++++++-----------
 LibGit2Sharp/LibGit2Sharp.csproj         |  5 +--
 LibGit2Sharp/Network.cs                  |  4 ++-
 LibGit2Sharp/PackBuilder.cs              |  4 +--
 LibGit2Sharp/Repository.cs               |  7 +++--
 LibGit2Sharp/SubmoduleCollection.cs      |  4 +--
 LibGit2Sharp/packages.config             |  2 +-
 15 files changed, 74 insertions(+), 45 deletions(-)
 create mode 100644 LibGit2Sharp/Core/GitProxyOptions.cs

diff --git a/LibGit2Sharp/Commands/Fetch.cs b/LibGit2Sharp/Commands/Fetch.cs
index a42b4e47c..ed8ca66c0 100644
--- a/LibGit2Sharp/Commands/Fetch.cs
+++ b/LibGit2Sharp/Commands/Fetch.cs
@@ -71,6 +71,8 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin
                     fetchOptions.Prune = FetchPruneStrategy.FromConfigurationOrDefault;
                 }
 
+                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
+
                 Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);
             }
 
diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs
index 294bbeebe..d8fa72a44 100644
--- a/LibGit2Sharp/Core/GitDiff.cs
+++ b/LibGit2Sharp/Core/GitDiff.cs
@@ -249,6 +249,7 @@ internal unsafe struct git_diff_file
         public Int64 Size;
         public GitDiffFlags Flags;
         public UInt16 Mode;
+        public UInt16 IdAbbrev;
     }
 
     [StructLayout(LayoutKind.Sequential)]
diff --git a/LibGit2Sharp/Core/GitErrorCategory.cs b/LibGit2Sharp/Core/GitErrorCategory.cs
index 0fa80ddc3..d9d930e1c 100644
--- a/LibGit2Sharp/Core/GitErrorCategory.cs
+++ b/LibGit2Sharp/Core/GitErrorCategory.cs
@@ -34,5 +34,6 @@ internal enum GitErrorCategory
         Describe,
         Rebase,
         Filesystem,
+        Patch
     }
 }
diff --git a/LibGit2Sharp/Core/GitFetchOptions.cs b/LibGit2Sharp/Core/GitFetchOptions.cs
index 7b284bf51..298c5ae33 100644
--- a/LibGit2Sharp/Core/GitFetchOptions.cs
+++ b/LibGit2Sharp/Core/GitFetchOptions.cs
@@ -10,6 +10,7 @@ internal class GitFetchOptions
         public FetchPruneStrategy Prune;
         public bool UpdateFetchHead = true;
         public TagFetchMode download_tags;
+        public GitProxyOptions ProxyOptions;
         public GitStrArrayManaged custom_headers;
     }
 }
diff --git a/LibGit2Sharp/Core/GitProxyOptions.cs b/LibGit2Sharp/Core/GitProxyOptions.cs
new file mode 100644
index 000000000..b62b8e08f
--- /dev/null
+++ b/LibGit2Sharp/Core/GitProxyOptions.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibGit2Sharp.Core
+{
+    internal enum GitProxyType
+    {
+        None,
+        Auto,
+        Specified
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct GitProxyOptions
+    {
+        public uint Version;
+        public GitProxyType Type;
+        public IntPtr Url;
+        public IntPtr CredentialsCb;
+        public IntPtr CertificateCheck;
+        public IntPtr CbPayload;
+    }
+}
diff --git a/LibGit2Sharp/Core/GitPushOptions.cs b/LibGit2Sharp/Core/GitPushOptions.cs
index 075a62b6b..f733534d2 100644
--- a/LibGit2Sharp/Core/GitPushOptions.cs
+++ b/LibGit2Sharp/Core/GitPushOptions.cs
@@ -8,6 +8,7 @@ internal class GitPushOptions
         public int Version = 1;
         public int PackbuilderDegreeOfParallelism;
         public GitRemoteCallbacks RemoteCallbacks;
+        public GitProxyOptions ProxyOptions;
         public GitStrArrayManaged CustomHeaders;
     }
 }
diff --git a/LibGit2Sharp/Core/GitSubmoduleOptions.cs b/LibGit2Sharp/Core/GitSubmoduleOptions.cs
index 4fb07411a..59c2b3f80 100644
--- a/LibGit2Sharp/Core/GitSubmoduleOptions.cs
+++ b/LibGit2Sharp/Core/GitSubmoduleOptions.cs
@@ -3,7 +3,7 @@
 namespace LibGit2Sharp.Core
 {
     [StructLayout(LayoutKind.Sequential)]
-    internal struct GitSubmoduleOptions
+    internal struct GitSubmoduleUpdateOptions
     {
         public uint Version;
 
@@ -12,5 +12,7 @@ internal struct GitSubmoduleOptions
         public GitFetchOptions FetchOptions;
 
         public CheckoutStrategy CloneCheckoutStrategy;
+
+        public int AllowFetch;
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index fada41672..e8ab4cc7a 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -121,11 +121,6 @@ internal static extern unsafe int git_blob_create_fromworkdir(
             git_repository* repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath relative_path);
 
-        internal delegate int source_callback(
-            IntPtr content,
-            int max_length,
-            IntPtr data);
-
         [DllImport(libgit2)]
         internal static extern unsafe int git_blob_create_fromstream(
             out IntPtr stream,
@@ -137,14 +132,6 @@ internal static extern unsafe int git_blob_create_fromstream_commit(
             ref GitOid oid,
             IntPtr stream);
 
-        [DllImport(libgit2)]
-        internal static extern unsafe int git_blob_create_fromchunks(
-            ref GitOid oid,
-            git_repository* repositoryPtr,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath hintpath,
-            source_callback fileCallback,
-            IntPtr data);
-
         [DllImport(libgit2)]
         internal static extern unsafe int git_blob_filtered_content(
             GitBuf buf,
@@ -1020,7 +1007,7 @@ internal static extern unsafe int git_packbuilder_insert_tree(
         internal static extern unsafe int git_packbuilder_new(out git_packbuilder* packbuilder, git_repository* repo);
 
         [DllImport(libgit2)]
-        internal static extern unsafe UInt32 git_packbuilder_object_count(git_packbuilder* packbuilder);
+        internal static extern unsafe UIntPtr git_packbuilder_object_count(git_packbuilder* packbuilder);
 
         [DllImport(libgit2)]
         internal static extern unsafe UInt32 git_packbuilder_set_threads(git_packbuilder* packbuilder, UInt32 numThreads);
@@ -1034,7 +1021,7 @@ internal static extern unsafe int git_packbuilder_write(
             IntPtr payload);
 
         [DllImport(libgit2)]
-        internal static extern unsafe UInt32 git_packbuilder_written(git_packbuilder* packbuilder);
+        internal static extern unsafe UIntPtr git_packbuilder_written(git_packbuilder* packbuilder);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_reference_create(
@@ -1213,6 +1200,7 @@ internal static extern unsafe int git_remote_connect(
             git_remote* remote,
             GitDirection direction,
             ref GitRemoteCallbacks callbacks,
+            ref GitProxyOptions proxy_options,
             ref GitStrArray custom_headers);
 
         [DllImport(libgit2)]
@@ -1644,7 +1632,7 @@ internal static extern unsafe int git_submodule_resolve_url(
         internal static extern unsafe int git_submodule_update(
             git_submodule* sm,
             [MarshalAs(UnmanagedType.Bool)] bool init,
-            ref GitSubmoduleOptions submoduleUpdateOptions);
+            ref GitSubmoduleUpdateOptions submoduleUpdateOptions);
 
         internal delegate int submodule_callback(
             IntPtr sm,
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
index cc3030663..8fcd8c48a 100644
--- a/LibGit2Sharp/Core/Proxy.cs
+++ b/LibGit2Sharp/Core/Proxy.cs
@@ -1693,12 +1693,12 @@ public static unsafe void git_packbuilder_write(PackBuilderHandle packbuilder, F
             Ensure.ZeroResult(res);
         }
 
-        public static unsafe uint git_packbuilder_object_count(PackBuilderHandle packbuilder)
+        public static unsafe UIntPtr git_packbuilder_object_count(PackBuilderHandle packbuilder)
         {
             return NativeMethods.git_packbuilder_object_count(packbuilder);
         }
 
-        public static unsafe uint git_packbuilder_written(PackBuilderHandle packbuilder)
+        public static unsafe UIntPtr git_packbuilder_written(PackBuilderHandle packbuilder)
         {
             return NativeMethods.git_packbuilder_written(packbuilder);
         }
@@ -2149,13 +2149,13 @@ public static unsafe RemoteHandle git_remote_create_anonymous(RepositoryHandle r
             return new RemoteHandle(handle, true);
         }
 
-        public static unsafe void git_remote_connect(RemoteHandle remote, GitDirection direction, ref GitRemoteCallbacks remoteCallbacks)
+        public static unsafe void git_remote_connect(RemoteHandle remote, GitDirection direction, ref GitRemoteCallbacks remoteCallbacks, ref GitProxyOptions proxyOptions)
         {
             GitStrArrayManaged customHeaders = new GitStrArrayManaged();
 
             try
             {
-                int res = NativeMethods.git_remote_connect(remote, direction, ref remoteCallbacks, ref customHeaders.Array);
+                int res = NativeMethods.git_remote_connect(remote, direction, ref remoteCallbacks, ref proxyOptions, ref customHeaders.Array);
                 Ensure.ZeroResult(res);
             }
             catch (Exception)
@@ -2993,7 +2993,7 @@ public static unsafe void git_submodule_add_to_index(SubmoduleHandle submodule,
             Ensure.ZeroResult(res);
         }
 
-        public static unsafe void git_submodule_update(SubmoduleHandle submodule, bool init, ref GitSubmoduleOptions options)
+        public static unsafe void git_submodule_update(SubmoduleHandle submodule, bool init, ref GitSubmoduleUpdateOptions options)
         {
             var res = NativeMethods.git_submodule_update(submodule, init, ref options);
             Ensure.ZeroResult(res);
@@ -3348,19 +3348,23 @@ 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
+            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
         }
 
         /// <summary>
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index bb9653c85..e436644ab 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.157\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -77,6 +77,7 @@
     <Compile Include="CompareOptions.cs" />
     <Compile Include="Core\FileHistory.cs" />
     <Compile Include="Core\GitFetchOptions.cs" />
+    <Compile Include="Core\GitProxyOptions.cs" />
     <Compile Include="Core\GitPushUpdate.cs" />
     <Compile Include="Core\GitSubmoduleIgnore.cs" />
     <Compile Include="Core\GitWriteStream.cs" />
@@ -383,7 +384,7 @@
     <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.157\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\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/Network.cs b/LibGit2Sharp/Network.cs
index 1841184ec..0d49c083b 100644
--- a/LibGit2Sharp/Network.cs
+++ b/LibGit2Sharp/Network.cs
@@ -118,6 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
             using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))
             {
                 GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };
+                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };
 
                 if (credentialsProvider != null)
                 {
@@ -125,7 +126,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
                     gitCallbacks = callbacks.GenerateCallbacks();
                 }
 
-                Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks);
+                Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks, ref proxyOptions);
                 return Proxy.git_remote_ls(repository, remoteHandle);
             }
         }
@@ -469,6 +470,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp
                                       {
                                           PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,
                                           RemoteCallbacks = gitCallbacks,
+                                          ProxyOptions = new GitProxyOptions { Version = 1 },
                                       });
             }
         }
diff --git a/LibGit2Sharp/PackBuilder.cs b/LibGit2Sharp/PackBuilder.cs
index 032181a1e..dcaa2617a 100644
--- a/LibGit2Sharp/PackBuilder.cs
+++ b/LibGit2Sharp/PackBuilder.cs
@@ -107,7 +107,7 @@ internal int SetMaximumNumberOfThreads(int nThread)
         /// </summary>
         internal long ObjectsCount
         {
-            get { return Proxy.git_packbuilder_object_count(packBuilderHandle); }
+            get { return (long)Proxy.git_packbuilder_object_count(packBuilderHandle); }
         }
 
         /// <summary>
@@ -116,7 +116,7 @@ internal long ObjectsCount
         /// </summary>
         internal long WrittenObjectsCount
         {
-            get { return Proxy.git_packbuilder_written(packBuilderHandle); }
+            get { return (long)Proxy.git_packbuilder_written(packBuilderHandle); }
         }
 
         internal PackBuilderHandle Handle
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index fc8783c76..7c4f2f1de 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -636,6 +636,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
             using (RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url))
             {
                 var gitCallbacks = new GitRemoteCallbacks { version = 1 };
+                var proxyOptions = new GitProxyOptions { Version = 1 };
 
                 if (credentialsProvider != null)
                 {
@@ -643,7 +644,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
                     gitCallbacks = callbacks.GenerateCallbacks();
                 }
 
-                Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks);
+                Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks, ref proxyOptions);
                 return Proxy.git_remote_ls(null, remoteHandle);
             }
         }
@@ -726,12 +727,14 @@ public static string Clone(string sourceUrl, string workdirPath,
                 var remoteCallbacks = new RemoteCallbacks(options);
                 var gitRemoteCallbacks = remoteCallbacks.GenerateCallbacks();
 
+                var gitProxyOptions = new GitProxyOptions { Version = 1 };
+
                 var cloneOpts = new GitCloneOptions
                 {
                     Version = 1,
                     Bare = options.IsBare ? 1 : 0,
                     CheckoutOpts = gitCheckoutOptions,
-                    FetchOpts = new GitFetchOptions { RemoteCallbacks = gitRemoteCallbacks },
+                    FetchOpts = new GitFetchOptions { ProxyOptions = gitProxyOptions, RemoteCallbacks = gitRemoteCallbacks },
                 };
 
                 string clonedRepoPath;
diff --git a/LibGit2Sharp/SubmoduleCollection.cs b/LibGit2Sharp/SubmoduleCollection.cs
index f5f50fa12..fc508107a 100644
--- a/LibGit2Sharp/SubmoduleCollection.cs
+++ b/LibGit2Sharp/SubmoduleCollection.cs
@@ -100,11 +100,11 @@ public virtual void Update(string name, SubmoduleUpdateOptions options)
                     var remoteCallbacks = new RemoteCallbacks(options);
                     var gitRemoteCallbacks = remoteCallbacks.GenerateCallbacks();
 
-                    var gitSubmoduleUpdateOpts = new GitSubmoduleOptions
+                    var gitSubmoduleUpdateOpts = new GitSubmoduleUpdateOptions
                     {
                         Version = 1,
                         CheckoutOptions = gitCheckoutOptions,
-                        FetchOptions = new GitFetchOptions { RemoteCallbacks = gitRemoteCallbacks },
+                        FetchOptions = new GitFetchOptions { ProxyOptions = new GitProxyOptions { Version = 1 }, RemoteCallbacks = gitRemoteCallbacks },
                         CloneCheckoutStrategy = CheckoutStrategy.GIT_CHECKOUT_SAFE
                     };
 
diff --git a/LibGit2Sharp/packages.config b/LibGit2Sharp/packages.config
index 00d525391..ee6d18e01 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.157" targetFramework="net4" allowedVersions="[1.0.157]" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net4" allowedVersions="[1.0.160]" />
 </packages>