diff --git a/CI/travis.osx.install.deps.sh b/CI/travis.osx.install.deps.sh index 19e7552a4..51082f15a 100755 --- a/CI/travis.osx.install.deps.sh +++ b/CI/travis.osx.install.deps.sh @@ -4,7 +4,7 @@ set -ev MONO_VER=2.10.10 brew update -brew install cmake +which cmake || brew install cmake wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" hdid "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" diff --git a/Lib/NativeBinaries/amd64/git2-091165c.dll b/Lib/NativeBinaries/amd64/git2-091165c.dll new file mode 100644 index 000000000..0c5dff5bc Binary files /dev/null and b/Lib/NativeBinaries/amd64/git2-091165c.dll differ diff --git a/Lib/NativeBinaries/amd64/git2-091165c.pdb b/Lib/NativeBinaries/amd64/git2-091165c.pdb new file mode 100644 index 000000000..d8e3ae44c Binary files /dev/null and b/Lib/NativeBinaries/amd64/git2-091165c.pdb differ diff --git a/Lib/NativeBinaries/amd64/git2-e93206e.dll b/Lib/NativeBinaries/amd64/git2-e93206e.dll deleted file mode 100644 index fc1a0f2b3..000000000 Binary files a/Lib/NativeBinaries/amd64/git2-e93206e.dll and /dev/null differ diff --git a/Lib/NativeBinaries/amd64/git2-e93206e.pdb b/Lib/NativeBinaries/amd64/git2-e93206e.pdb deleted file mode 100644 index 0d0e8825c..000000000 Binary files a/Lib/NativeBinaries/amd64/git2-e93206e.pdb and /dev/null differ diff --git a/Lib/NativeBinaries/x86/git2-091165c.dll b/Lib/NativeBinaries/x86/git2-091165c.dll new file mode 100644 index 000000000..3e941b240 Binary files /dev/null and b/Lib/NativeBinaries/x86/git2-091165c.dll differ diff --git a/Lib/NativeBinaries/x86/git2-091165c.pdb b/Lib/NativeBinaries/x86/git2-091165c.pdb new file mode 100644 index 000000000..c4a5864a0 Binary files /dev/null and b/Lib/NativeBinaries/x86/git2-091165c.pdb differ diff --git a/Lib/NativeBinaries/x86/git2-e93206e.dll b/Lib/NativeBinaries/x86/git2-e93206e.dll deleted file mode 100644 index dcf911480..000000000 Binary files a/Lib/NativeBinaries/x86/git2-e93206e.dll and /dev/null differ diff --git a/Lib/NativeBinaries/x86/git2-e93206e.pdb b/Lib/NativeBinaries/x86/git2-e93206e.pdb deleted file mode 100644 index 0bef5d390..000000000 Binary files a/Lib/NativeBinaries/x86/git2-e93206e.pdb and /dev/null differ diff --git a/LibGit2Sharp/Core/GitCloneOptions.cs b/LibGit2Sharp/Core/GitCloneOptions.cs index 915c56b12..803bc8b3c 100644 --- a/LibGit2Sharp/Core/GitCloneOptions.cs +++ b/LibGit2Sharp/Core/GitCloneOptions.cs @@ -20,11 +20,15 @@ internal struct GitCloneOptions public GitRemoteCallbacks RemoteCallbacks; public int Bare; - public int IgnoreCertErrors; public GitCloneLocal Local; - - public IntPtr RemoteName; public IntPtr CheckoutBranch; + public IntPtr signature; // Really a SignatureSafeHandle + + public IntPtr RepositoryCb; + public IntPtr RepositoryCbPayload; + + public IntPtr RemoteCb; + public IntPtr RemoteCbPayload; } } diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs index d68324d85..b1ee94734 100644 --- a/LibGit2Sharp/Core/NativeDllName.cs +++ b/LibGit2Sharp/Core/NativeDllName.cs @@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core { internal static class NativeDllName { - public const string Name = "git2-e93206e"; + public const string Name = "git2-091165c"; } } diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt index 69a9bd0a8..21ae06396 100644 --- a/LibGit2Sharp/libgit2_hash.txt +++ b/LibGit2Sharp/libgit2_hash.txt @@ -1 +1 @@ -e93206e0f5bd9a1f2ad17d0d566b1e815a762420 +091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d diff --git a/libgit2 b/libgit2 index e93206e0f..091165c53 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit e93206e0f5bd9a1f2ad17d0d566b1e815a762420 +Subproject commit 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d