Add git_reset

John Haley · John Haley · commit 493050c085c9 · 2015-02-19T13:54:29.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1415,6 +1415,12 @@
     },
     "reset": {
       "functions": {
+        "git_reset": {
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
+        },
         "git_reset_default": {
           "args": {
             "target": {
diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
@@ -107,6 +107,64 @@
     }
   },
   "new" : {
+    "functions": {
+      "git_reset": {
+        "type": "function",
+        "file": "reset.h",
+        "args": [
+          {
+            "name": "repo",
+            "type": "git_repository *"
+          },
+          {
+            "name": "target",
+            "type": "git_object *"
+          },
+          {
+            "name": "reset_type",
+            "type": "git_reset_t"
+          },
+          {
+            "name": "checkout_opts",
+            "type": "git_checkout_options *"
+          },
+          {
+            "name": "signature",
+            "type": "const git_signature *"
+          },
+          {
+            "name": "log_message",
+            "type": "const char *"
+          }
+        ],
+        "return": {
+          "type": "int"
+        },
+        "group": "reset"
+      }
+    },
+    "groups": [
+      [
+        "odb_object",
+        [
+          "git_odb_object_data",
+          "git_odb_object_dup",
+          "git_odb_object_free",
+          "git_odb_object_id",
+          "git_odb_object_size",
+          "git_odb_object_type"
+        ]
+      ],
+      [
+        "status_list",
+        [
+          "git_status_list_entrycount",
+          "git_status_list_free",
+          "git_status_list_get_perfdata",
+          "git_status_list_new"
+        ]
+      ]
+    ],
     "types": [
       [
         "git_direction",
@@ -340,28 +398,6 @@
           }
         }
       ]
-    ],
-    "groups": [
-      [
-        "odb_object",
-        [
-          "git_odb_object_data",
-          "git_odb_object_dup",
-          "git_odb_object_free",
-          "git_odb_object_id",
-          "git_odb_object_size",
-          "git_odb_object_type"
-        ]
-      ],
-      [
-        "status_list",
-        [
-          "git_status_list_entrycount",
-          "git_status_list_free",
-          "git_status_list_get_perfdata",
-          "git_status_list_new"
-        ]
-      ]
     ]
   },
   "remove": {
@@ -392,5 +428,10 @@
         "git_status_list_new"
       ]
     }
+  },
+  "groups": {
+    "reset": [
+      "git_reset"
+    ]
   }
 }
diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -11,16 +11,22 @@ var supplement = require("../input/libgit2-supplement.json");
 module.exports = function generateJson() {
   var helpers = require("./helpers");
   _ = require("lodash");
-
+  // libgit2's docs aren't complete so we'll add in what they're missing here
   libgit2.types.forEach(function(type) {
-    if (supplement.types[type[0]]){
+    if (supplement.types[type[0]]) {
       _.merge(type[1], supplement.types[type[0]]);
     }
   });
 
-  // libgit2's docs aren't complete so we'll add in what they're missing here
+  libgit2.groups.forEach(function(group) {
+    if (supplement.groups[group[0]]) {
+      Array.prototype.push.apply(group[1], supplement.groups[group[0]]);
+    }
+  });
+
   Array.prototype.push.apply(libgit2.types, supplement.new.types);
   Array.prototype.push.apply(libgit2.groups, supplement.new.groups);
+  _.merge(libgit2.functions, supplement.new.functions);
 
   var output = [];
   var dependencyLookup = {};
diff --git a/lib/reset.js b/lib/reset.js
@@ -8,4 +8,17 @@ Reset.default = function(repo, target, pathspecs) {
   return defaultFn.call(this, repo, target, pathspecs);
 };
 
+var reset = Reset.reset;
+Reset.reset = function(target, resetType, checkoutOpts, signature, logMessage) {
+  checkoutOpts = normalizeOptions(checkoutOpts, NodeGit.CheckoutOptions);
+
+  return reset.call(
+    this,
+    target,
+    resetType,
+    checkoutOpts,
+    signature,
+    logMessage);
+};
+
 module.exports = Reset;
