options wrapper and test for Cherrypick.commit

a8b8303ad19ca16d2467ed2243ad8e86b1193891
commit a8b8303ad19ca16d2467ed2243ad8e86b1193891
diff --git a/lib/cherrypick.js b/lib/cherrypick.js
@@ -4,11 +4,11 @@ var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Cherrypick = NodeGit.Cherrypick;
 var _cherrypick = Cherrypick.cherrypick;
+var _commit = Cherrypick.commit;
 
 /**
 * Cherrypick a commit and, changing the index and working directory
 *
-* @async
 * @param {Repository}         repo      The repo to checkout head
 * @param {Commit}             commit    The commit to cherrypick
 * @param {CherrypickOptions}  [options] Options for the cherrypick
@@ -40,3 +40,33 @@ Cherrypick.cherrypick = function(repo, commit, options) {
 
   return _cherrypick.call(this, repo, commit, options);
 };
+
+/**
+* Cherrypicks the given commit against "our" commit, producing an index that
+* reflects the result of the cherrypick. The index is not backed by a repo.
+*
+* @async
+* @param {Repository}   repo              The repo to cherrypick commits
+* @param {Commit}       cherrypick_commit The commit to cherrypick
+* @param {Commit}       our_commit        The commit to revert against
+* @param {int}          mainline          The parent of the revert commit (1 or
+*                                         2) if it's a merge, 0 otherwise
+* @param {MergeOptions} [merge_options]   Merge options for the cherrypick
+* @return {int}   0 on success, -1 on failure
+*/
+Cherrypick.commit = function(
+    repo,
+    cherrypick_commit,
+    our_commit,
+    mainline,
+    merge_options) {
+  merge_options = normalizeOptions(merge_options, NodeGit.MergeOptions);
+
+  return _commit.call(
+    this,
+    repo,
+    cherrypick_commit,
+    our_commit,
+    mainline,
+    merge_options);
+};
diff --git a/test/tests/cherrypick.js b/test/tests/cherrypick.js
@@ -183,4 +183,44 @@ describe("Cherrypick", function() {
           repoInfo.theirFileName + " should exist");
       });
   });
+
+  it("can cherrypick a commit onto another specified commit", function() {
+    var repo = this.repository;
+    var workDirPath = repo.workdir();
+    var repoInfo;
+
+    return setupBranches(repo)
+      .then(function(info) {
+        repoInfo = info;
+
+        assert(!fse.existsSync(path.join(workDirPath, repoInfo.ourFileName)),
+          repoInfo.ourFileName + " shouldn't exist");
+        assert(!fse.existsSync(path.join(workDirPath, repoInfo.theirFileName)),
+          repoInfo.theirFileName + " shouldn't exist");
+
+        return Cherrypick.commit(repo, repoInfo.theirCommit, repoInfo.ourCommit, 0, {});
+      })
+      .then(function(index) {
+        assert(index);
+        index.write();
+
+        return index.writeTreeTo(repo);
+      })
+      .then(function(oid) {
+        return repo.getTree(oid);
+      })
+      .then(function(tree) {
+        var opts = {
+          checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE
+        };
+
+        return NodeGit.Checkout.tree(repo, tree, opts);
+      })
+      .then(function() {
+        assert(fse.existsSync(path.join(workDirPath, repoInfo.ourFileName)),
+          repoInfo.ourFileName + " should exist");
+        assert(fse.existsSync(path.join(workDirPath, repoInfo.theirFileName)),
+          repoInfo.theirFileName + " should exist");
+      });
+  });
 });