BREAKING: Made Merge.merge async

Carson Howard · Carson Howard · commit 89c34899db97 · 2017-08-08T08:19:28.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1268,13 +1268,35 @@
     "merge": {
       "functions": {
         "git_merge": {
+          "isAsync": true,
           "args": {
+            "repo": {
+              "cppClassName": "GitRepository",
+              "cType": "git_repository *",
+              "jsClassName": "Repo"
+            },
             "their_heads": {
               "cType": "const git_annotated_commit **",
               "cppClassName": "Array",
               "jsClassName": "Array",
               "arrayElementCppClassName": "GitAnnotatedCommit"
+            },
+            "their_heads_len": {
+              "cType": "size_t",
+              "cppClassName": "Number",
+              "jsClassName": "Number"
+            },
+            "merge_opts": {
+              "cType": "git_merge_options *",
+              "cppClassName": "GitMergeOptions"
+            },
+            "checkout_opts": {
+              "cType": "git_checkout_options *",
+              "cppClassName": "GitCheckoutOptions"
             }
+          },
+          "return": {
+            "isErrorCode": true
           }
         },
         "git_merge_analysis": {
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -1539,9 +1539,7 @@ describe("Merge", function() {
       .then(function(theirAnnotatedCommit) {
         return NodeGit.Merge(repository, theirAnnotatedCommit);
       })
-      .then(function(result) {
-        assert.equal(result, 0);
-
+      .then(function() {
         assert.equal(repository.state(),
           NodeGit.Repository.STATE.MERGE);
         // verify the convenience method
