Make user of early-stop in CanMergeWithoutConflict

This stops at the first error so we can return negatives quicker.
libgit2 · Dec 14, 2015 · 092339c · 092339c
1 parent 6d14e31
commit 092339c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/LibGit2Sharp/ObjectDatabase.cs b/LibGit2Sharp/ObjectDatabase.cs
@@ -522,7 +522,13 @@ public virtual bool CanMergeWithoutConflict(Commit one, Commit another)
             Ensure.ArgumentNotNull(one, "one");
             Ensure.ArgumentNotNull(another, "another");
 
-            var result = repo.ObjectDatabase.MergeCommits(one, another, null);
+            var opts = new MergeTreeOptions()
+            {
+                SkipReuc = true,
+                FailOnConflict = true,
+            };
+
+            var result = repo.ObjectDatabase.MergeCommits(one, another, opts);
             return (result.Status == MergeTreeStatus.Succeeded);
         }