Enhance ObjectDatabase.CanMergeWithoutConflict() test coverage

nulltoken · nulltoken · commit a026f5d84e35 · 2015-02-26T10:10:34.000+01:00
diff --git a/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs b/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs
@@ -668,6 +668,46 @@ public void TestMergeIntoSelfHasNoConflicts()
             }
         }
 
+        [Fact]
+        public void TestMergeIntoOtherUnbornBranchHasNoConflicts()
+        {
+            string path = SandboxMergeTestRepo();
+            using (var repo = new Repository(path))
+            {
+                repo.Refs.UpdateTarget("HEAD", "refs/heads/unborn");
+
+                Touch(repo.Info.WorkingDirectory, "README", "Yeah!\n");
+                repo.Index.Clear();
+                repo.Stage("README");
+
+                repo.Commit("A new world, free of the burden of the history", Constants.Signature, Constants.Signature);
+
+                var master = repo.Branches["master"].Tip;
+                var branch = repo.Branches["unborn"].Tip;
+
+                Assert.True(repo.ObjectDatabase.CanMergeWithoutConflict(master, branch));
+            }
+        }
+
+        [Fact]
+        public void TestMergeIntoOtherUnbornBranchHasConflicts()
+        {
+            string path = SandboxMergeTestRepo();
+            using (var repo = new Repository(path))
+            {
+                repo.Refs.UpdateTarget("HEAD", "refs/heads/unborn");
+
+                repo.Index.Replace(repo.Lookup<Commit>("conflicts"));
+
+                repo.Commit("A conflicting world, free of the burden of the history", Constants.Signature, Constants.Signature);
+
+                var master = repo.Branches["master"].Tip;
+                var branch = repo.Branches["unborn"].Tip;
+
+                Assert.False(repo.ObjectDatabase.CanMergeWithoutConflict(master, branch));
+            }
+        }
+
         [Fact]
         public void TestMergeIntoOtherBranchHasNoConflicts()
         {
