8000 Update libgit2 to 821131f · repo-archive/libgit2sharp@9d17afe · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d17afe

Browse files
nulltokennulltoken
committed
Update libgit2 to 821131f
libgit2/libgit2@a99f33e...821131f
1 parent e8a9937 commit 9d17afe

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

‎LibGit2Sharp/ConfigurationLevel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ public enum ConfigurationLevel
88
/// <summary>
99
/// The local .git/config of the current repository.
1010
/// </summary>
11-
Local = 4,
11+
Local = 5,
1212

1313
/// <summary>
1414
/// The global ~/.gitconfig of the current user.
1515
/// </summary>
16-
Global = 3,
16+
Global = 4,
1717

1818
/// <summary>
1919
/// The global ~/.config/git/config of the current user.
2020
/// </summary>
21-
Xdg = 2,
21+
Xdg = 3,
2222

2323
/// <summary>
2424
/// The system wide .gitconfig.
2525
/// </summary>
26-
System = 1,
26+
System = 2,
2727
}
2828
}

‎LibGit2Sharp/Core/GitMergeOpts.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,18 @@ internal enum GitMergeTreeFlags
106106
GIT_MERGE_TREE_NORMAL = 0,
107107

108108
/// <summary>
109-
/// GIT_MERGE_TREE_FIND_RENAMES in libgit2
109+
/// Detect renames that occur between the common ancestor and the "ours"
110+
/// side or the common ancestor and the "theirs" side. This will enable
111+
/// the ability to merge between a modified and renamed file.
110112
/// </summary>
111113
GIT_MERGE_TREE_FIND_RENAMES = (1 << 0),
114+
115+
/// <summary>
116+
/// If a conflict occurs, exit immediately instead of attempting to
117+
/// continue resolving conflicts. The merge operation will fail with
118+
/// GIT_EMERGECONFLICT and no index will be returned.
119+
///</summary>
120+
GIT_MERGE_TREE_FAIL_ON_CONFLICT = (1 << 1),
112121
}
113122

114123
[Flags]

‎LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props')" />
3+
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -405,7 +405,7 @@
405405
<PropertyGroup>
406406
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
407407
</PropertyGroup>
408-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props'))" />
408+
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props'))" />
409409
</Target>
410410
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
411411
Other similar extension points exist, see Microsoft.Common.targets.

‎LibGit2Sharp/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.86" targetFramework="net40" allowedVersions="[1.0.86]" />
3+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.106" targetFramework="net4" allowedVersions="[1.0.106]" />
44
</packages>

0 commit comments

Comments
 (0)
0