Fix commit_create_cb

julianmesa-gitkraken · julianmesa-gitkraken · commit 3ef32e2366b6 · 2022-10-27T19:14:59.000+02:00
The definition was wrong parents should be an array of Commits not Oids.
Also we are copying the Oid in the callback so we are not returning the Oid so we must not set selfFreeing to false.
diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json
@@ -168,7 +168,7 @@
       },
       {
         "name": "parents",
-        "cType": "const git_oid * []"
+        "cType": "const git_commit * []"
       },
       {
         "name": "payload",
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -3142,10 +3142,10 @@
             },
             {
               "name": "parents",
-              "cType": "const git_oid **",
+              "cType": "const git_commit **",
               "cppClassName": "Array",
               "jsClassName": "Array",
-              "arrayElementCppClassName": "GitOid",
+              "arrayElementCppClassName": "GitCommit",
               "arrayLengthArgumentName": "parent_count"
             },
             {
diff --git a/generate/templates/partials/configurable_callbacks.cc b/generate/templates/partials/configurable_callbacks.cc
@@ -145,11 +145,11 @@
             else if (!result->IsNull() && !result->IsUndefined()) {
               {% if _return.isOutParam %}
                 {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To<v8::Object>(result).ToLocalChecked());
-                wrapper->selfFreeing = false;
 
                 {% if _return.cppClassName == "GitOid" %}
                   git_oid_cpy(baton->{{ _return.name }}, wrapper->GetValue());
                 {% else %}
+                  wrapper->selfFreeing = false;
                   *baton->{{ _return.name }} = wrapper->GetValue();
                 {% endif %}
                 baton->result = {{ field.return.success }};
@@ -185,11 +185,11 @@
               else if (!result->IsNull() && !result->IsUndefined()) {
                 {% if _return.isOutParam %}
                   {{ _return.cppClassName }}* wrapper = Nan::ObjectWrap::Unwrap<{{ _return.cppClassName }}>(Nan::To<v8::Object>(result).ToLocalChecked());
-                  wrapper->selfFreeing = false;
 
                   {% if _return.cppClassName == "GitOid" %}
                     git_oid_cpy(baton->{{ _return.name }}, wrapper->GetValue());
                   {% else %}
+                    wrapper->selfFreeing = false;
                     *baton->{{ _return.name }} = wrapper->GetValue();
                   {% endif %}
                   baton->result = {{ field.return.success }};
diff --git a/lib/repository.js b/lib/repository.js
@@ -623,7 +623,7 @@ Repository.prototype.createCommitBuffer = function(
  * @param {Signature} committer
  * @param {String} message
  * @param {Tree|Oid|String} Tree
- * @param {Array} parents
+ * @param {Array of Commits} parents
  * @param {Function} onSignature Callback to be called with string to be signed
  * @return {Oid} The oid of the commit
  */
@@ -638,29 +638,24 @@ Repository.prototype.createCommitWithSignature = function(
 ) {
 
   var repo = this;
-  var promises = [];
   var commitContent;
   var skippedSigning;
 
-  parents = parents || [];
-
-  promises.push(repo.getTree(tree));
-
-  parents.forEach(function(parent) {
-    promises.push(repo.getCommit(parent));
-  });
+  const directTreePromise = Promise.resolve(tree);
 
-  const createCommitPromise = Promise.all(promises).then(function(results) {
-    tree = results[0];
+  const getTreePromise = function() {
+    return repo.getTree(tree);
+  };
 
-    // Get the normalized values for our input into the function
-    var parentsLength = parents.length;
-    parents = [];
+  var treePromise;
 
-    for (var i = 0; i < parentsLength; i++) {
-      parents.push(results[i + 1]);
-    }
+  if (tree instanceof Tree) {
+    treePromise = directTreePromise;
+  } else {
+    treePromise = getTreePromise();
+  }
 
+  const createCommitPromise = treePromise.then(function(tree) {
     return Commit.createBuffer(
       repo,
       author,

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`},`
`169`	`169`	`{`
`170`	`170`	`"name": "parents",`
`171`		`- "cType": "const git_oid * []"`
	`171`	`+ "cType": "const git_commit * []"`
`172`	`172`	`},`
`173`	`173`	`{`
`174`	`174`	`"name": "payload",`
Original file line number	Diff line number	Diff line change
`@@ -3142,10 +3142,10 @@`
`3142`	`3142`	`},`
`3143`	`3143`	`{`
`3144`	`3144`	`"name": "parents",`
`3145`		`- "cType": "const git_oid **",`
	`3145`	`+ "cType": "const git_commit **",`
`3146`	`3146`	`"cppClassName": "Array",`
`3147`	`3147`	`"jsClassName": "Array",`
`3148`		`- "arrayElementCppClassName": "GitOid",`
	`3148`	`+ "arrayElementCppClassName": "GitCommit",`
`3149`	`3149`	`"arrayLengthArgumentName": "parent_count"`
`3150`	`3150`	`},`
`3151`	`3151`	`{`