8000 Update binaries to 69db893 · GiTechLab/libgit2sharp@e0a15ae · GitHub
[go: up one dir, main page]
Skip to content

Commit e0a15ae

Browse files
nulltokennulltoken
committed
Update binaries to 69db893
libgit2/libgit2@091165c...69db893
1 parent cf8c5fb commit e0a15ae

20 files changed

+32
-14
lines changed

‎Lib/NativeBinaries/amd64/git2-091165c.dll

-2.41 MB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-091165c.pdb

-5.74 MB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-69db893.dll

920 KB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2-69db893.pdb

5.29 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-091165c.dll

-1.72 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-091165c.pdb

-5.9 MB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-69db893.dll

702 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2-69db893.pdb

5.29 MB
Binary file not shown.

‎LibGit2Sharp.Tests/StatusFixture.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,8 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
495495
Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus("bin/look-ma.txt"));
496496
Assert.Equal(FileStatus.Untracked, repo.Index.RetrieveStatus("bin/what-about-me.txt"));
497497

498-
// bin/* is considered as ignoring the dir itself
499498
newStatus = repo.Index.RetrieveStatus();
500-
Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));
501499

502-
// if we recurse into ignored dirs, then we get the actual list
503-
newStatus = repo.Index.RetrieveStatus(new StatusOptions { RecurseIgnoredDirs = true });
504500
Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
505501
Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
506502
}

‎LibGit2Sharp/ChangeKind.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@ public enum ChangeKind
5050
/// of the file was changed.
5151
/// </summary>
5252
TypeChanged = 8,
53+
54+
/// <summary>
55+
/// Entry is unreadable.
56+
/// </summary>
57+
Unreadable = 9,
5358
}
5459
}

‎LibGit2Sharp/Core/GitDiff.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,16 @@ internal enum GitDiffOptionFlags
112112
/// </summary>
113113
GIT_DIFF_UPDATE_INDEX = (1 << 15),
114114

115+
/// <summary>
116+
/// Include unreadable files in the diff
117+
/// </summary>
118+
GIT_DIFF_INCLUDE_UNREADABLE = (1 << 16),
119+
120+
/// <sum A3E2 mary>
121+
/// Include unreadable files in the diff
122+
/// </summary>
123+
GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED = (1 << 17),
124+
115125
/*
116126
* Options controlling how output will be generated
117127
*/

‎LibGit2Sharp/Core/GitStatusOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,7 @@ internal enum GitStatusOptionFlags
4646
RenamesFromRewrites = (1 << 11),
4747
NoRefresh = (1 << 12),
4848
UpdateIndex = (1 << 13),
49+
IncludeUnreadable = (1 << 14),
50+
IncludeUnreadableAsUntracked = (1 << 15),
4951
}
5052
}

‎LibGit2Sharp/Core/NativeDllName.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
22
{
33
internal static class NativeDllName
44
{
5-
public const string Name = "git2-091165c";
5+
public const string Name = "git2-69db893";
66
}
77
}

‎LibGit2Sharp/Core/NativeMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ internal static extern int git_treebuilder_insert(
15321532
internal static extern int git_blob_is_binary(GitObjectSafeHandle blob);
15331533

15341534
[DllImport(libgit2)]
1535-
internal static extern int git_cherry_pick(RepositorySafeHandle repo, GitObjectSafeHandle commit, GitCherryPickOptions options);
1535+
internal static extern int git_cherrypick(RepositorySafeHandle repo, GitObjectSafeHandle commit, GitCherryPickOptions options);
15361536
}
15371537
}
15381538
// ReSharper restore InconsistentNaming

‎LibGit2Sharp/Core/Proxy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ public static void git_checkout_index(RepositorySafeHandle repo, GitObjectSafeHa
270270

271271
#region git_cherry_pick_
272272

273-
internal static void git_cherry_pick(RepositorySafeHandle repo, ObjectId commit, GitCherryPickOptions options)
273+
internal static void git_cherrypick(RepositorySafeHandle repo, ObjectId commit, GitCherryPickOptions options)
274274
{
275275
using (ThreadAffinity())
276276
using (var nativeCommit = git_object_lookup(repo, commit, GitObjectType.Commit))
277277
{
278-
int res = NativeMethods.git_cherry_pick(repo, nativeCommit, options);
278+
int res = NativeMethods.git_cherrypick(repo, nativeCommit, options);
279279
Ensure.ZeroResult(res);
280280
}
281281
}

‎LibGit2Sharp/FileStatus.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ public enum FileStatus
6868
/// </summary>
6969
RenamedInWorkDir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
7070

71+
/// <summary>
72+
/// The file is unreadable in the working directory.
73+
/// </summary>
74+
Unreadable = (1 << 12), /* GIT_STATUS_WT_UNREADABLE */
75+
7176
/// <summary>
7277
/// The file is <see cref="Untracked"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.
7378
/// </summary>

‎LibGit2Sharp/Mode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public enum Mode
88
// Inspired from http://stackoverflow.com/a/8347325/335418
99

1010
/// <summary>
11-
/// 000000 file mode (the entry doesn't exist)
11+
/// 000000 file mode (the entry doesn't exist or is unreadable)
1212
/// </summary>
1313
Nonexistent = 0,
1414

‎LibGit2Sharp/Repository.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ public CherryPickResult CherryPick(Commit commit, Signature committer, CherryPic
11551155

11561156
CherryPickResult result = null;
11571157

1158-
using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
1158+
using (var checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
11591159
{
11601160
var mergeOptions = new GitMergeOpts
11611161
{
@@ -1167,15 +1167,15 @@ public CherryPickResult CherryPick(Commit commit, Signature committer, CherryPic
11671167
TargetLimit = (uint)options.TargetLimit,
11681168
};
11691169

1170-
GitCherryPickOptions gitCherryPickOpts = new GitCherryPickOptions()
1170+
var gitCherryPickOpts = new GitCherryPickOptions()
11711171
{
1172< F42D /td>1172
Mainline = (uint)options.Mainline,
11731173
MergeOpts = mergeOptions,
11741174

11751175
CheckoutOpts = checkoutOptionsWrapper.Options,
11761176
};
11771177

1178-
Proxy.git_cherry_pick(handle, commit.Id.Oid, gitCherryPickOpts);
1178+
Proxy.git_cherrypick(handle, commit.Id.Oid, gitCherryPickOpts);
11791179

11801180
if (Index.IsFullyMerged)
11811181
{

‎LibGit2Sharp/libgit2_hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d
1+
69db89342712f47ee84d9368823ec294a0db1c65

‎libgit2

Submodule libgit2 updated 93 files

0 commit comments

Comments
 (0)
0