Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2sharp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2013-01-22 20:55:56 +0400
committernulltoken <emeric.fermas@gmail.com>2013-01-23 17:00:40 +0400
commita41d33626920b627573e76d0324d67ade5cd8d43 (patch)
treef6b3a8a9cbe06b898fe55d58f7c66e259aeecdd5
parent9b71e0f8c203cd1394dff22ea1dfeedc7b841e96 (diff)
Update libgit2 binaries to 586f71e
https://github.com/libgit2/libgit2/compare/7dfc5c3...586f71e
-rw-r--r--Lib/NativeBinaries/amd64/git2.dllbin701440 -> 712192 bytes
-rw-r--r--Lib/NativeBinaries/amd64/git2.pdbbin3985408 -> 3502080 bytes
-rw-r--r--Lib/NativeBinaries/x86/git2.dllbin526848 -> 533504 bytes
-rw-r--r--Lib/NativeBinaries/x86/git2.pdbbin3960832 -> 3624960 bytes
-rw-r--r--LibGit2Sharp/Core/GitOdbBackend.cs1
-rw-r--r--LibGit2Sharp/Core/NativeMethods.cs2
-rw-r--r--LibGit2Sharp/Core/Proxy.cs4
-rw-r--r--LibGit2Sharp/Index.cs2
-rw-r--r--LibGit2Sharp/TreeChanges.cs5
-rw-r--r--LibGit2Sharp/libgit2_hash.txt2
m---------libgit20
11 files changed, 11 insertions, 5 deletions
diff --git a/Lib/NativeBinaries/amd64/git2.dll b/Lib/NativeBinaries/amd64/git2.dll
index 1325ae59..c08ef0ec 100644
--- a/Lib/NativeBinaries/amd64/git2.dll
+++ b/Lib/NativeBinaries/amd64/git2.dll
Binary files differ
diff --git a/Lib/NativeBinaries/amd64/git2.pdb b/Lib/NativeBinaries/amd64/git2.pdb
index de25f4d5..0a4bfb8d 100644
--- a/Lib/NativeBinaries/amd64/git2.pdb
+++ b/Lib/NativeBinaries/amd64/git2.pdb
Binary files differ
diff --git a/Lib/NativeBinaries/x86/git2.dll b/Lib/NativeBinaries/x86/git2.dll
index 33875b03..ecea5a1e 100644
--- a/Lib/NativeBinaries/x86/git2.dll
+++ b/Lib/NativeBinaries/x86/git2.dll
Binary files differ
diff --git a/Lib/NativeBinaries/x86/git2.pdb b/Lib/NativeBinaries/x86/git2.pdb
index 5dba138c..c0ba0c18 100644
--- a/Lib/NativeBinaries/x86/git2.pdb
+++ b/Lib/NativeBinaries/x86/git2.pdb
Binary files differ
diff --git a/LibGit2Sharp/Core/GitOdbBackend.cs b/LibGit2Sharp/Core/GitOdbBackend.cs
index f27514bb..5bdc2f37 100644
--- a/LibGit2Sharp/Core/GitOdbBackend.cs
+++ b/LibGit2Sharp/Core/GitOdbBackend.cs
@@ -30,6 +30,7 @@ namespace LibGit2Sharp.Core
public writestream_callback WriteStream;
public readstream_callback ReadStream;
public exists_callback Exists;
+ public IntPtr Refresh;
public foreach_callback Foreach;
public IntPtr Writepack;
public free_callback Free;
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index ecfd1e6a..be258557 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -409,7 +409,7 @@ namespace LibGit2Sharp.Core
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof (Utf8Marshaler))] string path);
[DllImport(libgit2)]
- internal static extern int git_index_add_from_workdir(
+ internal static extern int git_index_add_bypath(
IndexSafeHandle index,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))] FilePath path);
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
index c8d7b790..3f9cb575 100644
--- a/LibGit2Sharp/Core/Proxy.cs
+++ b/LibGit2Sharp/Core/Proxy.cs
@@ -682,11 +682,11 @@ namespace LibGit2Sharp.Core
}
}
- public static void git_index_add_from_workdir(IndexSafeHandle index, FilePath path)
+ public static void git_index_add_bypath(IndexSafeHandle index, FilePath path)
{
using (ThreadAffinity())
{
- int res = NativeMethods.git_index_add_from_workdir(index, path);
+ int res = NativeMethods.git_index_add_bypath(index, path);
Ensure.Success(res);
}
}
diff --git a/LibGit2Sharp/Index.cs b/LibGit2Sharp/Index.cs
index 3dcea2b0..0ed25188 100644
--- a/LibGit2Sharp/Index.cs
+++ b/LibGit2Sharp/Index.cs
@@ -422,7 +422,7 @@ namespace LibGit2Sharp
private void AddToIndex(string relativePath)
{
- Proxy.git_index_add_from_workdir(handle, relativePath);
+ Proxy.git_index_add_bypath(handle, relativePath);
}
private void RemoveFromIndex(string relativePath)
diff --git a/LibGit2Sharp/TreeChanges.cs b/LibGit2Sharp/TreeChanges.cs
index 876a7b4c..3db0e5fa 100644
--- a/LibGit2Sharp/TreeChanges.cs
+++ b/LibGit2Sharp/TreeChanges.cs
@@ -27,6 +27,8 @@ namespace LibGit2Sharp
private readonly IDictionary<ChangeKind, Action<TreeChanges, TreeEntryChanges>> fileDispatcher = Build();
private readonly StringBuilder fullPatchBuilder = new StringBuilder();
+ private static readonly Comparison<TreeEntryChanges> ordinalComparer =
+ (one, other) => string.CompareOrdinal(one.Path, other.Path);
private static IDictionary<ChangeKind, Action<TreeChanges, TreeEntryChanges>> Build()
{
@@ -47,6 +49,9 @@ namespace LibGit2Sharp
internal TreeChanges(DiffListSafeHandle diff)
{
Proxy.git_diff_print_patch(diff, PrintCallBack);
+ added.Sort(ordinalComparer);
+ deleted.Sort(ordinalComparer);
+ modified.Sort(ordinalComparer);
}
private int PrintCallBack(GitDiffDelta delta, GitDiffRange range, GitDiffLineOrigin lineorigin, IntPtr content, UIntPtr contentlen, IntPtr payload)
diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt
index e6426a1a..797cb038 100644
--- a/LibGit2Sharp/libgit2_hash.txt
+++ b/LibGit2Sharp/libgit2_hash.txt
@@ -1 +1 @@
-7dfc5c3c6c4cebe6e2477186a8e7ed6e7dba2c55
+586f71ef2e6b1264c4dc7bc8270c2b7257675eb3
diff --git a/libgit2 b/libgit2
-Subproject 7dfc5c3c6c4cebe6e2477186a8e7ed6e7dba2c5
+Subproject 586f71ef2e6b1264c4dc7bc8270c2b7257675eb