Add git_reset_default and a test case

John Haley · John Haley · commit 2141be41340e · 2015-02-19T13:53:40.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1413,6 +1413,24 @@
         }
       }
     },
+    "reset": {
+      "functions": {
+        "git_reset_default": {
+          "args": {
+            "target": {
+              "isOptional": true
+            },
+            "pathspecs": {
+              "isOptional": true
+            }
+          },
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
+        }
+      }
+    },
     "revspec": {
       "ignore": true
     },
diff --git a/lib/reset.js b/lib/reset.js
@@ -0,0 +1,11 @@
+var NodeGit = require("../");
+var normalizeOptions = require("./util/normalize_options");
+
+var Reset = NodeGit.Reset;
+
+var defaultFn = Reset.default;
+Reset.default = function(repo, target, pathspecs) {
+  return defaultFn.call(this, repo, target, pathspecs);
+};
+
+module.exports = Reset;
diff --git a/test/tests/reset.js b/test/tests/reset.js
@@ -0,0 +1,77 @@
+var assert = require("assert");
+var path = require("path");
+var local = path.join.bind(path, __dirname);
+
+describe("Reset", function() {
+  var Repository = require(local("../../lib/repository"));
+  var Reset = require(local("../../lib/reset"));
+
+  var reposPath = local("../repos/workdir/.git");
+  var currentCommitOid = "32789a79e71fbc9e04d3eff7425e1771eb595150";
+  var previousCommitOid = "c82fb078a192ea221c9f1093c64321c60d64aa0d";
+  var filePath = "package.json";
+
+  before(function() {
+    var test = this;
+
+    return Repository.open(reposPath)
+      .then(function(repository) {
+        test.repo = repository;
+
+        return test.repo.getCommit(currentCommitOid);
+      })
+      .then(function(commit) {
+        test.currentCommit = commit;
+
+        return commit.getEntry(filePath);
+      })
+      .then(function(entry) {
+        return entry.getBlob();
+      })
+      .then(function(blob) {
+        test.currentCommitBlob = blob;
+
+        return test.repo.getCommit(previousCommitOid);
+      })
+      .then(function(commit) {
+        test.previousCommit = commit;
+
+        return commit.getEntry(filePath);
+      })
+      .then(function(entry) {
+        return entry.getBlob();
+      })
+      .then(function(blob) {
+        test.previousCommitBlob = blob;
+      });
+  });
+
+  it("can reset a file to a previous commit", function() {
+    var test = this;
+
+    return Reset.default(test.repo, test.previousCommit, filePath)
+    .then(function() {
+      return test.repo.openIndex();
+    })
+    .then(function(index) {
+      return index.writeTree();
+    })
+    .then(function(oid) {
+      return test.repo.getTree(oid);
+    })
+    .then(function(tree) {
+      return tree.getEntry(filePath);
+    })
+    .then(function(entry) {
+      return entry.getBlob();
+    })
+    .then(function(blob) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+      var previousCommitContents = test.previousCommitBlob.toString();
+      var resetContents = blob.toString();
+
+      assert(resetContents != currentCommitContents);
+      assert(resetContents == previousCommitContents);
+    });
+  });
+});
