Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Commit ed519c5

Browse files
author
Edward Thomson
committed
Update libgit2 to 3f8d005
libgit2/libgit2@e0383fa...3f8d005
1 parent 7a31788 commit ed519c5

20 files changed

+94
-130
lines changed
963 KB
Binary file not shown.
-944 KB
Binary file not shown.
730 KB
Binary file not shown.
-718 KB
Binary file not shown.

LibGit2Sharp.Tests/RemoteFixture.cs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,14 @@ public void CanRenameExistingRemote()
259259
}
260260

261261
[Fact]
262-
public void CanRenameNonExistingRemote()
262+
public void RenamingNonExistingRemoteThrows()
263263
{
264264
using (var repo = new Repository(StandardTestRepoPath))
265265
{
266-
Assert.Null(repo.Network.Remotes["i_dont_exist"]);
267-
268-
repo.Network.Remotes.Rename("i_dont_exist", "i_dont_either", problem => Assert.True(false));
269-
Assert.Null(repo.Network.Remotes["i_dont_either"]);
266+
Assert.Throws<NotFoundException>(() =>
267+
{
268+
repo.Network.Remotes.Rename("i_dont_exist", "i_dont_either");
269+
});
270270
}
271271
}
272272

@@ -327,20 +327,5 @@ public void CanNotRenameWhenRemoteWithSameNameExists()
327327
Assert.Throws<NameConflictException>(() => repo.Network.Remotes.Rename("origin", "upstream"));
328328
}
329329
}
330-
331-
[Theory]
332-
[InlineData("git@github.com:org/repo.git", false)]
333-
[InlineData("git://site.com:80/org/repo.git", true)]
334-
[InlineData("ssh://user@host.com:80/org/repo.git", false)]
335-
[InlineData("http://site.com:80/org/repo.git", true)]
336-
[InlineData("https://github.com:80/org/repo.git", true)]
337-
[InlineData("ftp://site.com:80/org/repo.git", false)]
338-
[InlineData("ftps://site.com:80/org/repo.git", false)]
339-
[InlineData("file:///path/repo.git", true)]
340-
[InlineData("protocol://blah.meh/whatever.git", false)]
341-
public void CanCheckIfUrlisSupported(string url, bool supported)
342-
{
343-
Assert.Equal(supported, Remote.IsSupportedUrl(url));
344-
}
345330
}
346331
}

LibGit2Sharp/Core/GitDiff.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ internal class GitDiffOptions : IDisposable
205205

206206
/* options controlling how to diff text is generated */
207207

208-
public ushort ContextLines;
209-
public ushort InterhunkLines;
208+
public uint ContextLines;
209+
public uint InterhunkLines;
210210
public ushort IdAbbrev;
211211
public Int64 MaxSize;
212212
public IntPtr OldPrefixString;

LibGit2Sharp/Core/Handles/GitMergeHeadHandle.cs renamed to LibGit2Sharp/Core/Handles/GitAnnotatedCommitHandle.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace LibGit2Sharp.Core.Handles
44
{
5-
internal class GitMergeHeadHandle : SafeHandleBase
5+
internal class GitAnnotatedCommitHandle : SafeHandleBase
66
{
77
protected override bool ReleaseHandleImpl()
88
{
9-
Proxy.git_merge_head_free(handle);
9+
Proxy.git_annotated_commit_free(handle);
1010
return true;
1111
}
1212
}

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-e0383fa";
5+
public const string Name = "git2-3f8d005";
66
}
77
}

0 commit comments

Comments
 (0)