Update binaries to 69db893

https://github.com/libgit2/libgit2/compare/091165c...69db893

20 files changed, 31 insertions, 13 deletions

diff --git a/Lib/NativeBinaries/amd64/git2-091165c.dll b/Lib/NativeBinaries/amd64/git2-091165c.dll
deleted file mode 100644
index 0c5dff5b..00000000
--- a/Lib/NativeBinaries/amd64/git2-091165c.dll
+++ /dev/null
diff --git a/Lib/NativeBinaries/amd64/git2-091165c.pdb b/Lib/NativeBinaries/amd64/git2-091165c.pdb
deleted file mode 100644
index d8e3ae44..00000000
--- a/Lib/NativeBinaries/amd64/git2-091165c.pdb
+++ /dev/null
diff --git a/Lib/NativeBinaries/amd64/git2-69db893.dll b/Lib/NativeBinaries/amd64/git2-69db893.dll
new file mode 100644
index 00000000..1b439544
--- /dev/null
+++ b/Lib/NativeBinaries/amd64/git2-69db893.dll
diff --git a/Lib/NativeBinaries/amd64/git2-69db893.pdb b/Lib/NativeBinaries/amd64/git2-69db893.pdb
new file mode 100644
index 00000000..7ac43395
--- /dev/null
+++ b/Lib/NativeBinaries/amd64/git2-69db893.pdb
diff --git a/Lib/NativeBinaries/x86/git2-091165c.dll b/Lib/NativeBinaries/x86/git2-091165c.dll
deleted file mode 100644
index 3e941b24..00000000
--- a/Lib/NativeBinaries/x86/git2-091165c.dll
+++ /dev/null
diff --git a/Lib/NativeBinaries/x86/git2-091165c.pdb b/Lib/NativeBinaries/x86/git2-091165c.pdb
deleted file mode 100644
index c4a5864a..00000000
--- a/Lib/NativeBinaries/x86/git2-091165c.pdb
+++ /dev/null
diff --git a/Lib/NativeBinaries/x86/git2-69db893.dll b/Lib/NativeBinaries/x86/git2-69db893.dll
new file mode 100644
index 00000000..4295b98e
--- /dev/null
+++ b/Lib/NativeBinaries/x86/git2-69db893.dll
diff --git a/Lib/NativeBinaries/x86/git2-69db893.pdb b/Lib/NativeBinaries/x86/git2-69db893.pdb
new file mode 100644
index 00000000..1a4fcf5c
--- /dev/null
+++ b/Lib/NativeBinaries/x86/git2-69db893.pdb
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
index 4a63bc93..b70ff0ae 100644
--- a/LibGit2Sharp.Tests/StatusFixture.cs
+++ b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -495,12 +495,8 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus("bin/look-ma.txt"));
                 Assert.Equal(FileStatus.Untracked, repo.Index.RetrieveStatus("bin/what-about-me.txt"));
 
-                // bin/* is considered as ignoring the dir itself
                 newStatus = repo.Index.RetrieveStatus();
-                Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
 
-                // if we recurse into ignored dirs, then we get the actual list
-                newStatus = repo.Index.RetrieveStatus(new StatusOptions { RecurseIgnoredDirs = true });
                 Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
                 Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
             }
diff --git a/LibGit2Sharp/ChangeKind.cs b/LibGit2Sharp/ChangeKind.cs
index 612e036d..c95095a3 100644
--- a/LibGit2Sharp/ChangeKind.cs
+++ b/LibGit2Sharp/ChangeKind.cs
@@ -50,5 +50,10 @@ namespace LibGit2Sharp
         /// of the file was changed.
         /// </summary>
         TypeChanged = 8,
+
+        /// <summary>
+        /// Entry is unreadable.
+        /// </summary>
+        Unreadable = 9,
     }
 }
diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs
index 7581bcfb..27b5fab1 100644
--- a/LibGit2Sharp/Core/GitDiff.cs
+++ b/LibGit2Sharp/Core/GitDiff.cs
@@ -112,6 +112,16 @@ namespace LibGit2Sharp.Core
         /// </summary>
         GIT_DIFF_UPDATE_INDEX = (1 << 15),
 
+        /// <summary>
+        /// Include unreadable files in the diff
+        /// </summary>
+        GIT_DIFF_INCLUDE_UNREADABLE = (1 << 16),
+
+        /// <summary>
+        /// Include unreadable files in the diff
+        /// </summary>
+        GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED = (1 << 17),
+
         /*
          * Options controlling how output will be generated
          */
diff --git a/LibGit2Sharp/Core/GitStatusOptions.cs b/LibGit2Sharp/Core/GitStatusOptions.cs
index af753a43..bc0956e8 100644
--- a/LibGit2Sharp/Core/GitStatusOptions.cs
+++ b/LibGit2Sharp/Core/GitStatusOptions.cs
@@ -46,5 +46,7 @@ namespace LibGit2Sharp.Core
         RenamesFromRewrites = (1 << 11),
         NoRefresh = (1 << 12),
         UpdateIndex = (1 << 13),
+        IncludeUnreadable = (1 << 14),
+        IncludeUnreadableAsUntracked = (1 << 15),
     }
 }
diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs
index b1ee9473..62603ace 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-091165c";
+		public const string Name = "git2-69db893";
 	}
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index f6bb9c75..9a3d7207 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -1532,7 +1532,7 @@ namespace LibGit2Sharp.Core
         internal static extern int git_blob_is_binary(GitObjectSafeHandle blob);
 
         [DllImport(libgit2)]
-        internal static extern int git_cherry_pick(RepositorySafeHandle repo, GitObjectSafeHandle commit, GitCherryPickOptions options);
+        internal static extern int git_cherrypick(RepositorySafeHandle repo, GitObjectSafeHandle commit, GitCherryPickOptions options);
     }
 }
 // ReSharper restore InconsistentNaming
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
index 4850a0b5..9daaf8dd 100644
--- a/LibGit2Sharp/Core/Proxy.cs
+++ b/LibGit2Sharp/Core/Proxy.cs
@@ -270,12 +270,12 @@ namespace LibGit2Sharp.Core
 
         #region git_cherry_pick_
 
-        internal static void git_cherry_pick(RepositorySafeHandle repo, ObjectId commit, GitCherryPickOptions options)
+        internal static void git_cherrypick(RepositorySafeHandle repo, ObjectId commit, GitCherryPickOptions options)
         {
             using (ThreadAffinity())
             using (var nativeCommit = git_object_lookup(repo, commit, GitObjectType.Commit))
             {
-                int res = NativeMethods.git_cherry_pick(repo, nativeCommit, options);
+                int res = NativeMethods.git_cherrypick(repo, nativeCommit, options);
                 Ensure.ZeroResult(res);
             }
         }
diff --git a/LibGit2Sharp/FileStatus.cs b/LibGit2Sharp/FileStatus.cs
index 08fa73f6..68e41b7b 100644
--- a/LibGit2Sharp/FileStatus.cs
+++ b/LibGit2Sharp/FileStatus.cs
@@ -69,6 +69,11 @@ namespace LibGit2Sharp
         RenamedInWorkDir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
 
         /// <summary>
+        /// The file is unreadable in the working directory.
+        /// </summary>
+        Unreadable = (1 << 12), /* GIT_STATUS_WT_UNREADABLE */
+
+        /// <summary>
         /// The file is <see cref="Untracked"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.
         /// </summary>
         Ignored = (1 << 14), /* GIT_STATUS_IGNORED */
diff --git a/LibGit2Sharp/Mode.cs b/LibGit2Sharp/Mode.cs
index b15a2a97..b2ade9dd 100644
--- a/LibGit2Sharp/Mode.cs
+++ b/LibGit2Sharp/Mode.cs
@@ -8,7 +8,7 @@
         // Inspired from http://stackoverflow.com/a/8347325/335418
 
         /// <summary>
-        /// 000000 file mode (the entry doesn't exist)
+        /// 000000 file mode (the entry doesn't exist or is unreadable)
         /// </summary>
         Nonexistent = 0,
 
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 1c583c52..daec39e3 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -1155,7 +1155,7 @@ namespace LibGit2Sharp
 
             CherryPickResult result = null;
 
-            using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
+            using (var checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
             {
                 var mergeOptions = new GitMergeOpts
                 {
@@ -1167,7 +1167,7 @@ namespace LibGit2Sharp
                     TargetLimit = (uint)options.TargetLimit,
                 };
 
-                GitCherryPickOptions gitCherryPickOpts = new GitCherryPickOptions()
+                var gitCherryPickOpts = new GitCherryPickOptions()
                 {
                     Mainline = (uint)options.Mainline,
                     MergeOpts = mergeOptions,
@@ -1175,7 +1175,7 @@ namespace LibGit2Sharp
                     CheckoutOpts = checkoutOptionsWrapper.Options,
                 };
 
-                Proxy.git_cherry_pick(handle, commit.Id.Oid, gitCherryPickOpts);
+                Proxy.git_cherrypick(handle, commit.Id.Oid, gitCherryPickOpts);
 
                 if (Index.IsFullyMerged)
                 {
diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt
index 21ae0639..a34df739 100644
--- a/LibGit2Sharp/libgit2_hash.txt
+++ b/LibGit2Sharp/libgit2_hash.txt
@@ -1 +1 @@
-091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d
+69db89342712f47ee84d9368823ec294a0db1c65
diff --git a/libgit2 b/libgit2
-Subproject 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5
+Subproject 69db89342712f47ee84d9368823ec294a0db1c6