Enforce Proxy.git_merge_trees() error handling

joshvera · nulltoken · commit 296ee5da41c1 · 2015-03-03T21:30:50.000+01:00
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -1081,10 +1081,7 @@ public static IndexSafeHandle git_merge_trees(RepositorySafeHandle repo, GitObje
                 IndexSafeHandle index;
                 GitMergeOpts opts = new GitMergeOpts { Version = 1 };
                 int res = NativeMethods.git_merge_trees(out index, repo, ancestorTree, ourTree, theirTree, ref opts);
-                if (res != (int) GitErrorCode.Ok || index == null)
-                {
-                    return null;
-                }
+                Ensure.ZeroResult(res);
 
                 return index;
             }
