Starting to fix update errors

John Haley · John Haley · commit fcde5767f1c3 · 2015-02-11T10:40:57.000-07:00
diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json
@@ -522,6 +522,32 @@
       "error": -1
     }
   },
+  "git_transport_certificate_check_cb": {
+    "args": [
+      {
+        "name": "cert",
+        "cType": "git_cert *"
+      },
+      {
+        "name": "valid",
+        "cType": "int"
+      },
+      {
+        "name": "host",
+        "cType": "const char *"
+      },
+      {
+        "name": "payload",
+        "cType": "void *"
+      }
+    ],
+    "return": {
+      "type": "int",
+      "noResults": 1,
+      "success": 0,
+      "error": -1
+    }
+  },
   "git_transport_message_cb": {
     "args": [
       {
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -214,6 +214,22 @@
         }
       }
     },
+    "clone_options": {
+      "fields": {
+        "repository_cb": {
+          "ignore": true
+        },
+        "repository_cb_payload": {
+          "ignore": true
+        },
+        "remote_cb": {
+          "ignore": true
+        },
+        "remote_cb_payload": {
+          "ignore": true
+        }
+      }
+    },
     "commit": {
       "functions": {
         "git_commit_create": {
diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
@@ -357,16 +357,6 @@
           "git_odb_object_type"
         ]
       ],
-      [
-        "merge_head",
-        [
-          "git_merge_head_free",
-          "git_merge_head_from_fetchhead",
-          "git_merge_head_from_id",
-          "git_merge_head_from_ref",
-          "git_merge_head_id"
-        ]
-      ],
       [
         "status_list",
         [
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -108,6 +108,7 @@ module.exports = function generateNativeCode() {
     utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)));
     // Write out all the classes.
     enabled.forEach(function(idef) {
+if (idef.filename == 'clone_options') debugger;
       try {
         if (idef.type && idef.type != "enum") {
           utils.writeFile(

Original file line number	Diff line number	Diff line change
`@@ -357,16 +357,6 @@`
`357`	`357`	`"git_odb_object_type"`
`358`	`358`	`]`
`359`	`359`	`],`
`360`		`- [`
`361`		`- "merge_head",`
`362`		`- [`
`363`		`- "git_merge_head_free",`
`364`		`- "git_merge_head_from_fetchhead",`
`365`		`- "git_merge_head_from_id",`
`366`		`- "git_merge_head_from_ref",`
`367`		`- "git_merge_head_id"`
`368`		`- ]`
`369`		`- ],`
`370`	`360`	`[`
`371`	`361`	`"status_list",`
`372`	`362`	`[`