diff --git a/CHANGES.md b/CHANGES.md index a7cc7ea13..b26dac602 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,20 @@ - CodeBetter TeamCity: - Travis: +## v0.18.1 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.18.0...v0.18.1)) + +### Additions + + - Make CommitOptions expose additional properties to control how the message should be prettified (#744, #745) + +### Changes + + - Update libgit2 binaries to libgit2/libgit2@90befde + +### Fixes + + - Fix issue when cloning from a different local volume (#742, #743) + ## v0.18.0 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.17.0...v0.18.0)) ### Additions diff --git a/Lib/NativeBinaries/amd64/git2-2f6f6eb.dll b/Lib/NativeBinaries/amd64/git2-2f6f6eb.dll deleted file mode 100644 index 53f104730..000000000 Binary files a/Lib/NativeBinaries/amd64/git2-2f6f6eb.dll and /dev/null differ diff --git a/Lib/NativeBinaries/amd64/git2-90befde.dll b/Lib/NativeBinaries/amd64/git2-90befde.dll new file mode 100644 index 000000000..5af4cbce4 Binary files /dev/null and b/Lib/NativeBinaries/amd64/git2-90befde.dll differ diff --git a/Lib/NativeBinaries/amd64/git2-2f6f6eb.pdb b/Lib/NativeBinaries/amd64/git2-90befde.pdb similarity index 52% rename from Lib/NativeBinaries/amd64/git2-2f6f6eb.pdb rename to Lib/NativeBinaries/amd64/git2-90befde.pdb index 4578d77fd..bc9fb2269 100644 Binary files a/Lib/NativeBinaries/amd64/git2-2f6f6eb.pdb and b/Lib/NativeBinaries/amd64/git2-90befde.pdb differ diff --git a/Lib/NativeBinaries/x86/git2-2f6f6eb.dll b/Lib/NativeBinaries/x86/git2-90befde.dll similarity index 52% rename from Lib/NativeBinaries/x86/git2-2f6f6eb.dll rename to Lib/NativeBinaries/x86/git2-90befde.dll index 3c955415d..086bfda98 100644 Binary files a/Lib/NativeBinaries/x86/git2-2f6f6eb.dll and b/Lib/NativeBinaries/x86/git2-90befde.dll differ diff --git a/Lib/NativeBinaries/x86/git2-2f6f6eb.pdb b/Lib/NativeBinaries/x86/git2-90befde.pdb similarity index 53% rename from Lib/NativeBinaries/x86/git2-2f6f6eb.pdb rename to Lib/NativeBinaries/x86/git2-90befde.pdb index 69de6e262..8a6ab03aa 100644 Binary files a/Lib/NativeBinaries/x86/git2-2f6f6eb.pdb and b/Lib/NativeBinaries/x86/git2-90befde.pdb differ diff --git a/LibGit2Sharp.Tests/CloneFixture.cs b/LibGit2Sharp.Tests/CloneFixture.cs index 2ffb5fe19..f287cde5a 100644 --- a/LibGit2Sharp.Tests/CloneFixture.cs +++ b/LibGit2Sharp.Tests/CloneFixture.cs @@ -36,20 +36,20 @@ public void CanClone(string url) } } - private void AssertLocalClone(string path) + private void AssertLocalClone(string url, string path = null, bool isCloningAnEmptyRepository = false) { var scd = BuildSelfCleaningDirectory(); - string clonedRepoPath = Repository.Clone(path, scd.DirectoryPath); + string clonedRepoPath = Repository.Clone(url, scd.DirectoryPath); using (var clonedRepo = new Repository(clonedRepoPath)) - using (var originalRepo = new Repository(BareTestRepoPath)) + using (var originalRepo = new Repository(path ?? url)) { Assert.NotEqual(originalRepo.Info.Path, clonedRepo.Info.Path); Assert.Equal(originalRepo.Head, clonedRepo.Head); Assert.Equal(originalRepo.Branches.Count(), clonedRepo.Branches.Count(b => b.IsRemote)); - Assert.Equal(1, clonedRepo.Branches.Count(b => !b.IsRemote)); + Assert.Equal(isCloningAnEmptyRepository ? 0 : 1, clonedRepo.Branches.Count(b => !b.IsRemote)); Assert.Equal(originalRepo.Tags.Count(), clonedRepo.Tags.Count()); Assert.Equal(1, clonedRepo.Network.Remotes.Count()); @@ -60,7 +60,7 @@ private void AssertLocalClone(string path) public void CanCloneALocalRepositoryFromALocalUri() { var uri = new Uri(BareTestRepoPath); - AssertLocalClone(uri.AbsoluteUri); + AssertLocalClone(uri.AbsoluteUri, BareTestRepoPath); } [Fact] @@ -69,6 +69,15 @@ public void CanCloneALocalRepositoryFromAStandardPath() AssertLocalClone(BareTestRepoPath); } + [Fact] + public void CanCloneALocalRepositoryFromANewlyCreatedTemporaryPath() + { + var path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString().Substring(0, 8)); + SelfCleaningDirectory scd = BuildSelfCleaningDirectory(path); + Repository.Init(scd.DirectoryPath); + AssertLocalClone(scd.DirectoryPath, isCloningAnEmptyRepository: true); + } + [Theory] [InlineData("http://github.com/libgit2/TestGitRepository")] [InlineData("https://github.com/libgit2/TestGitRepository")] diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs index ec9cc1fcc..5fd4f2b5a 100644 --- a/LibGit2Sharp/Core/NativeDllName.cs +++ b/LibGit2Sharp/Core/NativeDllName.cs @@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core { internal static class NativeDllName { - public const string Name = "git2-2f6f6eb"; + public const string Name = "git2-90befde"; } } diff --git a/LibGit2Sharp/Properties/AssemblyInfo.cs b/LibGit2Sharp/Properties/AssemblyInfo.cs index 08988c23f..58286cd15 100644 --- a/LibGit2Sharp/Properties/AssemblyInfo.cs +++ b/LibGit2Sharp/Properties/AssemblyInfo.cs @@ -42,5 +42,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.18.0")] -[assembly: AssemblyFileVersion("0.18.0")] +[assembly: AssemblyVersion("0.18.1")] +[assembly: AssemblyFileVersion("0.18.1")] diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt index 682059084..44e16bb22 100644 --- a/LibGit2Sharp/libgit2_hash.txt +++ b/LibGit2Sharp/libgit2_hash.txt @@ -1 +1 @@ -2f6f6ebc9937220302875de96ce129919296670a +90befde4a1938641dfdb9a7bdb9f361d1de5c26f diff --git a/libgit2 b/libgit2 index 2f6f6ebc9..90befde4a 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit 2f6f6ebc9937220302875de96ce129919296670a +Subproject commit 90befde4a1938641dfdb9a7bdb9f361d1de5c26f