Skip to content

Commit 6329bea

Browse files
bordingbording
authored
Merge pull request #1905 from jairbubbles/update-to-libgit-1-1-1
Update LibGit2 to version 1.1.1
2 parents f5098f4 + 9941d39 commit 6329bea

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

Diff for: ‎LibGit2Sharp.Tests/CloneFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void AssertLocalClone(string url, string path = null, bool isCloningAnEm
7070
Assert.NotEqual(originalRepo.Info.Path, clonedRepo.Info.Path);
7171
Assert.Equal(originalRepo.Head, clonedRepo.Head);
7272

73-
Assert.Equal(originalRepo.Branches.Count(), clonedRepo.Branches.Count(b => b.IsRemote));
73+
Assert.Equal(originalRepo.Branches.Count(), clonedRepo.Branches.Count(b => b.IsRemote && b.FriendlyName != "origin/HEAD"));
7474
Assert.Equal(isCloningAnEmptyRepository ? 0 : 1, clonedRepo.Branches.Count(b => !b.IsRemote));
7575

7676
Assert.Equal(originalRepo.Tags.Count(), clonedRepo.Tags.Count());

Diff for: ‎LibGit2Sharp.Tests/FetchFixture.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public void FetchHonorsTheFetchPruneConfigurationEntry()
215215

216216
using (var clonedRepo = new Repository(clonedRepoPath))
217217
{
218-
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote));
218+
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote && b.FriendlyName != "origin/HEAD"));
219219

220220
// Drop one of the branches in the remote repository
221221
using (var sourceRepo = new Repository(source))
@@ -226,17 +226,17 @@ public void FetchHonorsTheFetchPruneConfigurationEntry()
226226
// No pruning when the configuration entry isn't defined
227227
Assert.Null(clonedRepo.Config.Get<bool>("fetch.prune"));
228228
Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
229-
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote));
229+
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote && b.FriendlyName != "origin/HEAD"));
230230

231231
// No pruning when the configuration entry is set to false
232232
clonedRepo.Config.Set<bool>("fetch.prune", false);
233233
Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
234-
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote));
234+
Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote && b.FriendlyName != "origin/HEAD"));
235235

236236
// Auto pruning when the configuration entry is set to true
237237
clonedRepo.Config.Set<bool>("fetch.prune", true);
238238
Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
239-
Assert.Equal(4, clonedRepo.Branches.Count(b => b.IsRemote));
239+
Assert.Equal(4, clonedRepo.Branches.Count(b => b.IsRemote && b.FriendlyName != "origin/HEAD"));
240240
}
241241
}
242242

Diff for: ‎LibGit2Sharp/Core/NativeMethods.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private sealed class NativeShutdownObject : CriticalFinalizerObject
227227
internal static extern unsafe GitError* git_error_last();
228228

229229
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
230-
internal static extern void git_error_set_str(
230+
internal static extern int git_error_set_str(
231231
GitErrorCategory error_class,
232232
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string errorString);
233233

@@ -252,25 +252,25 @@ internal static extern unsafe int git_blame_file(
252252
internal static extern unsafe void git_blame_free(git_blame* blame);
253253

254254
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
255-
internal static extern unsafe int git_blob_create_fromdisk(
255+
internal static extern unsafe int git_blob_create_from_disk(
256256
ref GitOid id,
257257
git_repository* repo,
258258
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
259259

260260
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
261-
internal static extern unsafe int git_blob_create_fromworkdir(
261+
internal static extern unsafe int git_blob_create_from_workdir(
262262
ref GitOid id,
263263
git_repository* repo,
264264
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath relative_path);
265265

266266
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
267-
internal static extern unsafe int git_blob_create_fromstream(
267+
internal static extern unsafe int git_blob_create_from_stream(
268268
out IntPtr stream,
269269
git_repository* repositoryPtr,
270270
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string hintpath);
271271

272272
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
273-
internal static extern int git_blob_create_fromstream_commit(
273+
internal static extern int git_blob_create_from_stream_commit(
274274
ref GitOid oid,
275275
IntPtr stream);
276276

@@ -1616,7 +1616,7 @@ internal static extern unsafe int git_repository_open_ext(
16161616
internal static extern unsafe FilePath git_repository_path(git_repository* repository);
16171617

16181618
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
1619-
internal static extern unsafe void git_repository_set_config(
1619+
internal static extern unsafe int git_repository_set_config(
16201620
git_repository* repository,
16211621
git_config* config);
16221622

@@ -1628,7 +1628,7 @@ internal static extern unsafe int git_repository_set_ident(
16281628

16291629

16301630
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
1631-
internal static extern unsafe void git_repository_set_index(
1631+
internal static extern unsafe int git_repository_set_index(
16321632
git_repository* repository,
16331633
git_index* index);
16341634

@@ -1710,13 +1710,13 @@ internal static extern unsafe int git_revparse_ext(
17101710
internal static extern unsafe int git_revwalk_push(git_revwalk* walker, ref GitOid id);
17111711

17121712
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
1713-
internal static extern unsafe void git_revwalk_reset(git_revwalk* walker);
1713+
internal static extern unsafe int git_revwalk_reset(git_revwalk* walker);
17141714

17151715
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
1716-
internal static extern unsafe void git_revwalk_sorting(git_revwalk* walk, CommitSortStrategies sort);
1716+
internal static extern unsafe int git_revwalk_sorting(git_revwalk* walk, CommitSortStrategies sort);
17171717

17181718
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
1719-
internal static extern unsafe void git_revwalk_simplify_first_parent(git_revwalk* walk);
1719+
internal static extern unsafe int git_revwalk_simplify_first_parent(git_revwalk* walk);
17201720

17211721
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
17221722
internal static extern unsafe void git_signature_free(git_signature* signature);

Diff for: ‎LibGit2Sharp/Core/Proxy.cs

+20-19
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@ public static unsafe BlameHandle git_blame_file(
3636

3737
#region git_blob_
3838

39-
public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, string hintpath)
39+
public static unsafe IntPtr git_blob_create_from_stream(RepositoryHandle repo, string hintpath)
4040
{
4141
IntPtr writestream_ptr;
4242

43-
Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream(out writestream_ptr, repo, hintpath));
43+
Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream(out writestream_ptr, repo, hintpath));
4444
return writestream_ptr;
4545
}
4646

4747
public static unsafe ObjectId git_blob_create_fromstream_commit(IntPtr writestream_ptr)
4848
{
4949
var oid = new GitOid();
50-
Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream_commit(ref oid, writestream_ptr));
50+
Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream_commit(ref oid, writestream_ptr));
5151
return oid;
5252
}
5353

54-
public static unsafe ObjectId git_blob_create_fromdisk(RepositoryHandle repo, FilePath path)
54+
public static unsafe ObjectId git_blob_create_from_disk(RepositoryHandle repo, FilePath path)
5555
{
5656
var oid = new GitOid();
57-
int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path);
57+
int res = NativeMethods.git_blob_create_from_disk(ref oid, repo, path);
5858
Ensure.ZeroResult(res);
5959

6060
return oid;
6161
}
6262

63-
public static unsafe ObjectId git_blob_create_fromfile(RepositoryHandle repo, FilePath path)
63+
public static unsafe ObjectId git_blob_create_from_workdir(RepositoryHandle repo, FilePath path)
6464
{
6565
var oid = new GitOid();
66-
int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path);
66+
int res = NativeMethods.git_blob_create_from_workdir(ref oid, repo, path);
6767
Ensure.ZeroResult(res);
6868

6969
return oid;
@@ -855,21 +855,22 @@ public static unsafe int git_diff_num_deltas(DiffHandle diff)
855855

856856
#region git_error_
857857

858-
public static void git_error_set_str(GitErrorCategory error_class, Exception exception)
858+
public static int git_error_set_str(GitErrorCategory error_class, Exception exception)
859859
{
860860
if (exception is OutOfMemoryException)
861861
{
862862
NativeMethods.git_error_set_oom();
863+
return 0;
863864
}
864865
else
865866
{
866-
NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));
867+
return NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));
867868
}
868869
}
869870

870-
public static void git_error_set_str(GitErrorCategory error_class, String errorString)
871+
public static int git_error_set_str(GitErrorCategory error_class, String errorString)
871872
{
872-
NativeMethods.git_error_set_str(error_class, errorString);
873+
return NativeMethods.git_error_set_str(error_class, errorString);
873874
}
874875

875876
/// <summary>
@@ -2589,9 +2590,9 @@ public static unsafe FilePath git_repository_path(RepositoryHandle repo)
25892590
return NativeMethods.git_repository_path(repo);
25902591
}
25912592

2592-
public static unsafe void git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)
2593+
public static unsafe int git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)
25932594
{
2594-
NativeMethods.git_repository_set_config(repo, config);
2595+
return NativeMethods.git_repository_set_config(repo, config);
25952596
}
25962597

25972598
public static unsafe void git_repository_set_ident(RepositoryHandle repo, string name, string email)
@@ -2600,9 +2601,9 @@ public static unsafe void git_repository_set_ident(RepositoryHandle repo, string
26002601
Ensure.ZeroResult(res);
26012602
}
26022603

2603-
public static unsafe void git_repository_set_index(RepositoryHandle repo, IndexHandle index)
2604+
public static unsafe int git_repository_set_index(RepositoryHandle repo, IndexHandle index)
26042605
{
2605-
NativeMethods.git_repository_set_index(repo, index);
2606+
return NativeMethods.git_repository_set_index(repo, index);
26062607
}
26072608

26082609
public static unsafe void git_repository_set_workdir(RepositoryHandle repo, FilePath workdir)
@@ -2783,14 +2784,14 @@ public static unsafe void git_revwalk_reset(RevWalkerHandle walker)
27832784
NativeMethods.git_revwalk_reset(walker);
27842785
}
27852786

2786-
public static unsafe void git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)
2787+
public static unsafe int git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)
27872788
{
2788-
NativeMethods.git_revwalk_sorting(walker, options);
2789+
return NativeMethods.git_revwalk_sorting(walker, options);
27892790
}
27902791

2791-
public static unsafe void git_revwalk_simplify_first_parent(RevWalkerHandle walker)
2792+
public static unsafe int git_revwalk_simplify_first_parent(RevWalkerHandle walker)
27922793
{
2793-
NativeMethods.git_revwalk_simplify_first_parent(walker);
2794+
return NativeMethods.git_revwalk_simplify_first_parent(walker);
27942795
}
27952796

27962797
#endregion

Diff for: ‎LibGit2Sharp/LibGit2Sharp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.314]" PrivateAssets="none" />
35+
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.315-alpha.0.1]" PrivateAssets="none" />
3636
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
3737
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" PrivateAssets="all" />
3838
</ItemGroup>

Diff for: ‎LibGit2Sharp/ObjectDatabase.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public virtual Blob CreateBlob(string path)
104104
}
105105

106106
ObjectId id = Path.IsPathRooted(path)
107-
? Proxy.git_blob_create_fromdisk(repo.Handle, path)
108-
: Proxy.git_blob_create_fromfile(repo.Handle, path);
107+
? Proxy.git_blob_create_from_disk(repo.Handle, path)
108+
: Proxy.git_blob_create_from_workdir(repo.Handle, path);
109109

110110
return repo.Lookup<Blob>(id);
111111
}
@@ -277,7 +277,7 @@ private unsafe Blob CreateBlob(Stream stream, string hintpath, long? numberOfByt
277277
throw new ArgumentException("The stream cannot be read from.", "stream");
278278
}
279279

280-
IntPtr writestream_ptr = Proxy.git_blob_create_fromstream(repo.Handle, hintpath);
280+
IntPtr writestream_ptr = Proxy.git_blob_create_from_stream(repo.Handle, hintpath);
281281
GitWriteStream writestream = Marshal.PtrToStructure<GitWriteStream>(writestream_ptr);
282282

283283
try

0 commit comments

Comments
 (0)