8000 Update libgit2 to dce7b1a · octoco/libgit2sharp@f545299 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f545299

Browse files
author
Edward Thomson
committed
Update libgit2 to dce7b1a
libgit2/libgit2@4eb97ef...dce7b1a
1 parent 8c48d39 commit f545299

File tree

13 files changed

+23
-23
lines changed

13 files changed

+23
-23
lines changed
-968 KB
Binary file not shown.
975 KB
Binary file not shown.
-733 KB
Binary file not shown.
740 KB
Binary file not shown.

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-4eb97ef";
5+
public const string Name = "git2-dce7b1a";
66
}
77
}

LibGit2Sharp/Core/NativeMethods.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ internal static extern int git_tree_entry_bypath(
15551555
internal static extern UIntPtr git_tree_entrycount(GitObjectSafeHandle tree);
15561556

15571557
[DllImport(libgit2)]
1558-
internal static extern int git_treebuilder_create(out TreeBuilderSafeHandle builder, IntPtr src);
1558+
internal static extern int git_treebuilder_create(out TreeBuilderSafeHandle builder, RepositorySafeHandle repo, IntPtr src);
15591559

15601560
[DllImport(libgit2)]
15611561
internal static extern int git_treebuilder_insert(
@@ -1566,7 +1566,7 @@ internal static extern int git_treebuilder_insert(
15661566
uint attributes);
15671567

15681568
[DllImport(libgit2)]
1569-
internal static extern int git_treebuilder_write(out GitOid id, RepositorySafeHandle repo, TreeBuilderSafeHandle bld);
1569+
internal static extern int git_treebuilder_write(out GitOid id, TreeBuilderSafeHandle bld);
15701570

15711571
[DllImport(libgit2)]
15721572
internal static extern void git_treebuilder_free(IntPtr bld);

LibGit2Sharp/Core/Proxy.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3064,12 +3064,12 @@ public static int git_tree_entrycount(GitObjectSafeHandle tree)
30643064

30653065
#region git_treebuilder_
30663066

3067-
public static TreeBuilderSafeHandle git_treebuilder_create()
3067+
public static TreeBuilderSafeHandle git_treebuilder_create(RepositorySafeHandle repo)
30683068
{
30693069
using (ThreadAffinity())
30703070
{
30713071
TreeBuilderSafeHandle builder;
3072-
int res = NativeMethods.git_treebuilder_create(out builder, IntPtr.Zero);
3072+
int res = NativeMethods.git_treebuilder_create(out builder, repo, IntPtr.Zero);
30733073
Ensure.ZeroResult(res);
30743074

30753075
return builder;
@@ -3091,12 +3091,12 @@ public static void git_treebuilder_insert(TreeBuilderSafeHandle builder, string
30913091
}
30923092
}
30933093

3094-
public static ObjectId git_treebuilder_write(RepositorySafeHandle repo, TreeBuilderSafeHandle bld)
3094+
public static ObjectId git_treebuilder_write(TreeBuilderSafeHandle bld)
30953095
{
30963096
using (ThreadAffinity())
30973097
{
30983098
GitOid oid;
3099-
int res = NativeMethods.git_treebuilder_write(out oid, repo, bld);
3099+
int res = NativeMethods.git_treebuilder_write(out oid, bld);
31003100
Ensure.ZeroResult(res);
31013101

31023102
return oid;

LibGit2Sharp/TreeDefinition.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ internal Tree Build(Repository repository)
283283
{
284284
WrapAllTreeDefinitions(repository);
285285

286-
using (var builder = new TreeBuilder())
286+
using (var builder = new TreeBuilder(repository))
287287
{
288288
var builtTreeEntryDefinitions = new List<Tuple<string, TreeEntryDefinition>>(entries.Count);
289289

@@ -309,7 +309,7 @@ internal Tree Build(Repository repository)
309309

310310
builtTreeEntryDefinitions.ForEach(t => entries[t.Item1] = t.Item2);
311311

312-
ObjectId treeId = builder.Write(repository);
312+
ObjectId treeId = builder.Write();
313313
return repository.Lookup<Tree>(treeId);
314314
}
315315
}
@@ -371,19 +371,19 @@ private class TreeBuilder : IDisposable
371371
{
372372
private readonly TreeBuilderSafeHandle handle;
373373

374-
public TreeBuilder()
374+
public TreeBuilder(Repository repo)
375375
{
376-
handle = Proxy.git_treebuilder_create();
376+
handle = Proxy.git_treebuilder_create(repo.Handle);
377377
}
378378

379379
public void Insert(string name, TreeEntryDefinition treeEntryDefinition)
380380
{
381381
Proxy.git_treebuilder_insert(handle, name, treeEntryDefinition);
382382
}
383383

384-
public ObjectId Write(Repository repo)
384+
public ObjectId Write()
385385
{
386-
return Proxy.git_treebuilder_write(repo.Handle, handle);
386+
return Proxy.git_treebuilder_write(handle);
387387
}
388388

389389
public void Dispose()

LibGit2Sharp/libgit2_hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4eb97ef3bf18403fbce351ae4cac673655d2886a
1+
dce7b1a4e75551804a33591744d40d0582c57cfb

libgit2

Submodule libgit2 updated 165 files

nuget.package/build/LibGit2Sharp.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-4eb97ef.dll">
5-
<Link>NativeBinaries\amd64\git2-4eb97ef.dll</Link>
4+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-dce7b1a.dll">
5+
<Link>NativeBinaries\amd64\git2-dce7b1a.dll</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
</None>
8-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-4eb97ef.pdb">
9-
<Link>NativeBinaries\amd64\git2-4eb97ef.pdb</Link>
8+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-dce7b1a.pdb">
9+
<Link>NativeBinaries\amd64\git2-dce7b1a.pdb</Link>
1010
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1111
</None>
12-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-4eb97ef.dll">
13-
<Link>NativeBinaries\x86\git2-4eb97ef.dll</Link>
12+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-dce7b1a.dll">
13+
<Link>NativeBinaries\x86\git2-dce7b1a.dll</Link>
1414
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1515
</None>
16-
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-4eb97ef.pdb">
17-
<Link>NativeBinaries\x86\git2-4eb97ef.pdb</Link>
16+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-dce7b1a.pdb">
17+
<Link>NativeBinaries\x86\git2-dce7b1a.pdb</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
2020
</ItemGroup>

0 commit comments

Comments
 (0)
0