Fix inmemory odb backends. ObjectDatabase now has to create a new odb…

… and set it on the repository when it is InMemory.
pigalot · Aug 4, 2017 · 481e330 · 481e330
1 parent f8d6dac
commit 481e330
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 5 deletions.
diff --git a/LibGit2Sharp.Tests/OdbBackendFixture.cs b/LibGit2Sharp.Tests/OdbBackendFixture.cs
@@ -251,6 +251,21 @@ public void ADisposableOdbBackendGetsDisposedUponRepositoryDisposal()
             Assert.Equal(1, nbOfDisposeCalls);
         }
 
+        [Fact]
+        public void CanCreateInMemoryRepositoryWithBackend()
+        {
+            using (var repo = new Repository())
+            {
+                repo.ObjectDatabase.AddBackend(new MockOdbBackend(), int.MaxValue);
+
+                Assert.True(repo.Info.IsBare);
+                Assert.Null(repo.Info.Path);
+                Assert.Null(repo.Info.WorkingDirectory);
+
+                Assert.Throws<BareRepositoryException>(() => { var idx = repo.Index; });
+            }
+        }
+
         #region MockOdbBackend
 
         private class MockOdbBackend : OdbBackend, IDisposable

diff --git a/LibGit2Sharp.Tests/RepositoryFixture.cs b/LibGit2Sharp.Tests/RepositoryFixture.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
-using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -685,6 +684,8 @@ public void CanCreateInMemoryRepository()
         {
             using (var repo = new Repository())
             {
+                Assert.NotNull(repo.ObjectDatabase);
+
                 Assert.True(repo.Info.IsBare);
                 Assert.Null(repo.Info.Path);
                 Assert.Null(repo.Info.WorkingDirectory);

diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -1420,6 +1420,12 @@ internal static extern unsafe int git_repository_message(
         internal static extern unsafe int git_repository_new(
             out git_repository* repo);
 
+        [DllImport(libgit2)]
+        internal static extern unsafe void git_repository_set_odb(git_repository* repo, IntPtr odb);
+
+        [DllImport(libgit2)]
+        internal static extern unsafe int git_odb_new(out git_odb* odb);
+
         [DllImport(libgit2)]
         internal static extern unsafe int git_repository_odb(out git_odb* odb, git_repository* repo);
 

diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -2612,6 +2612,20 @@ public static unsafe string git_repository_message(RepositoryHandle repo)
             }
         }
 
+        public static unsafe void git_repository_set_odb(RepositoryHandle repo, IntPtr gitOdbBackendPointer)
+        {
+            NativeMethods.git_repository_set_odb(repo, gitOdbBackendPointer);
+        }
+
+        public static unsafe ObjectDatabaseHandle git_odb_new()
+        {
+            git_odb* handle;
+            var res = NativeMethods.git_odb_new(out handle);
+            Ensure.ZeroResult(res);
+
+            return new ObjectDatabaseHandle(handle, true);
+        }
+
         public static unsafe ObjectDatabaseHandle git_repository_odb(RepositoryHandle repo)
         {
             git_odb* handle;

diff --git a/LibGit2Sharp/ObjectDatabase.cs b/LibGit2Sharp/ObjectDatabase.cs
@@ -25,10 +25,20 @@ public class ObjectDatabase : IEnumerable<GitObject>
         protected ObjectDatabase()
         { }
 
-        internal ObjectDatabase(Repository repo)
+        internal ObjectDatabase(Repository repo, bool isInMemory)
         {
             this.repo = repo;
-            handle = Proxy.git_repository_odb(repo.Handle);
+
+            if (isInMemory)
+            {
+                handle = Proxy.git_odb_new();
+
+                Proxy.git_repository_set_odb(repo.Handle, handle.AsIntPtr());
+            }
+            else
+            {
+                handle = Proxy.git_repository_odb(repo.Handle);
+            }
 
             repo.RegisterForCleanup(handle);
         }

diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -114,7 +114,8 @@ private Repository(string path, RepositoryOptions options, RepositoryRequiredPar
                 /* TODO: bug in libgit2, update when fixed by
                  * https://github.com/libgit2/libgit2/pull/2970
                  */
-                if (path == null)
+                var isInMemory = path == null;
+                if (isInMemory)
                 {
                     isBare = true;
                 }
@@ -172,7 +173,8 @@ private Repository(string path, RepositoryOptions options, RepositoryRequiredPar
                                                                                             configurationGlobalFilePath,
                                                                                             configurationXDGFilePath,
                                                                                             configurationSystemFilePath)));
-                odb = new Lazy<ObjectDatabase>(() => new ObjectDatabase(this));
+                odb = new Lazy<ObjectDatabase>(() => new ObjectDatabase(this, isInMemory));
+
                 diff = new Diff(this);
                 notes = new NoteCollection(this);
                 ignore = new Ignore(this);