Skip to content

Checking that autocrlf settings are now honored on non Win platforms #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Checking that autocrlf settings are now honored on non Win platforms #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21462a9
Check https://github.com/libgit2/libgit2/pull/2798
nulltoken Feb 15, 2015
0227063
hack the nix script
nulltoken Feb 15, 2015
d635d4b
fixup! hack the nix script
nulltoken Feb 21, 2015
56c5312
fixup! Check https://github.com/libgit2/libgit2/pull/2798
nulltoken Feb 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Lib/NativeBinaries/amd64/git2-a248208.dll
View file
Open in desktop
Binary file not shown.
Binary file renamed Lib/NativeBinaries/amd64/git2-e0902fb.pdb → Lib/NativeBinaries/amd64/git2-a248208.pdb
View file
Open in desktop
Binary file not shown.
Binary file removed Lib/NativeBinaries/amd64/git2-e0902fb.dll
View file
Open in desktop
Binary file not shown.
Binary file added Lib/NativeBinaries/x86/git2-a248208.dll
View file
Open in desktop
Binary file not shown.
Binary file renamed Lib/NativeBinaries/x86/git2-e0902fb.pdb → Lib/NativeBinaries/x86/git2-a248208.pdb
View file
Open in desktop
Binary file not shown.
Binary file removed Lib/NativeBinaries/x86/git2-e0902fb.dll
View file
Open in desktop
Binary file not shown.
9 changes: 0 additions & 9 deletions LibGit2Sharp.Tests/BlobFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public void CanGetBlobAsText()
[InlineData("true", "hey there\r\n")]
public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)
{
SkipIfNotSupported(autocrlf);

var path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Expand Down Expand Up @@ -131,8 +129,6 @@ public void CanReadBlobStream()
[InlineData("true", "hey there\r\n")]
public void CanReadBlobFilteredStream(string autocrlf, string expectedContent)
{
SkipIfNotSupported(autocrlf);

var path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Expand Down Expand Up @@ -219,10 +215,5 @@ public void CanTellIfTheBlobContentLooksLikeBinary()
Assert.Equal(false, blob.IsBinary);
}
}

private static void SkipIfNotSupported(string autocrlf)
{
InconclusiveIf(() => autocrlf == "true" && IsRunningOnLinux(), "Non-Windows does not support core.autocrlf = true");
}
}
}
2 changes: 1 addition & 1 deletion LibGit2Sharp/Core/NativeDllName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
{
internal static class NativeDllName
{
public const string Name = "git2-e0902fb";
public const string Name = "git2-a248208";
}
}
2 changes: 1 addition & 1 deletion LibGit2Sharp/libgit2_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e0902fbce7d14631bd02091c1c70cde3e68f78ab
a248208dda9af488f6963d06bd5b1dbb9d1a62d5
5 changes: 5 additions & 0 deletions build.libgit2sharp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt`
SHORTSHA=${LIBGIT2SHA:0:7}
EXTRADEFINE="$1"

cd libgit2
git fetch origin refs/pull/2798/merge:refs/remotes/pr/2798
git checkout refs/remotes/pr/2798
cd ..

rm -rf libgit2/build
mkdir libgit2/build
pushd libgit2/build
Expand Down
16 changes: 8 additions & 8 deletions nuget.package/build/LibGit2Sharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-e0902fb.dll">
<Link>NativeBinaries\amd64\git2-e0902fb.dll</Link>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-a248208.dll">
<Link>NativeBinaries\amd64\git2-a248208.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-e0902fb.pdb">
<Link>NativeBinaries\amd64\git2-e0902fb.pdb</Link>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-a248208.pdb">
<Link>NativeBinaries\amd64\git2-a248208.pdb</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-e0902fb.dll">
<Link>NativeBinaries\x86\git2-e0902fb.dll</Link>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-a248208.dll">
<Link>NativeBinaries\x86\git2-a248208.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-e0902fb.pdb">
<Link>NativeBinaries\x86\git2-e0902fb.pdb</Link>
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-a248208.pdb">
<Link>NativeBinaries\x86\git2-a248208.pdb</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down