From ab8a68ce1f265d5163771ee86836cd792d8bbf15 Mon Sep 17 00:00:00 2001
From: Tim Branyen <tim@tabdeveloper.com>
Date: Wed, 15 Oct 2014 21:56:54 -0400
Subject: [PATCH] Adds in buffer and cherry pick

---
 generate/descriptor.json |  83 ++++++++++++++++----
 generate/types.json      | 161 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 229 insertions(+), 15 deletions(-)

diff --git a/generate/descriptor.json b/generate/descriptor.json
index d260176d6..7a96d251e 100644
--- a/generate/descriptor.json
+++ b/generate/descriptor.json
@@ -176,7 +176,25 @@
     }
   },
 
-  "buffer": {
+  "buf": {
+    "cType": "git_buf",
+
+    "functions": {
+      "git_buf_free": {
+        "ignore": true,
+        "args": [{ "shouldAlloc": true }]
+      },
+
+      "git_buf_grow": {
+        "ignore": false,
+        "args": [{ "shouldAlloc": true }]
+      },
+
+      "git_buf_set": {
+        "ignore": false,
+        "args": [{ "shouldAlloc": true }]
+      }
+    }
   },
 
   "checkout": {
@@ -222,6 +240,47 @@
     "fields": []
   },
 
+  "cherrypick": {
+    "cType": "git_commit",
+    "altType": "git_cherry_pick",
+    "trim": false,
+
+    "dependencies": [
+      "../include/cherry_pick_options.h",
+      "../include/merge_options.h",
+      "../include/index.h",
+      "../include/repository.h",
+      "../include/commit.h"
+    ],
+
+    "functions": {
+      "git_cherry_pick": {
+        "ignore": false
+      },
+
+      "git_cherry_pick_commit": {
+        "ignore": false
+      },
+
+      "git_cherry_pick_init_options": {
+        "ignore": false
+      }
+    }
+  },
+
+  "cherry_pick_options": {
+    "cType": "git_cherry_pick_options",
+    "isStruct": true,
+
+    "dependencies": [
+      "../include/functions/copy.h",
+      "../include/cherry_pick_options.h",
+      "../include/checkout_options.h"
+    ],
+
+    "fields": []
+  },
+
   "clone": {
     "cType": null,
     "trim": false,
@@ -361,10 +420,6 @@
     }
   },
 
-  "common": {
-    "cType": null
-  },
-
   "config": {
   },
 
@@ -583,8 +638,9 @@
     ]
   },
 
-  "errors": {
-    "cType": null
+  "error": {
+    "cType": "git_error",
+    "altType": "giterr"
   },
 
   "filter": {
@@ -614,6 +670,11 @@
     "cType": null
   },
 
+  "merge_options": {
+    "cType": "git_merge_options",
+    "isStruct": true
+  },
+
   "message": {
     "cType": null
   },
@@ -1005,14 +1066,6 @@
     "cType": null
   },
 
-  "stdint": {
-    "cType": null
-  },
-
-  "stdarray": {
-    "cType": null
-  },
-
   "strarray": {
     "cType": "git_strarray"
   },
diff --git a/generate/types.json b/generate/types.json
index 508fd82c8..12541244e 100644
--- a/generate/types.json
+++ b/generate/types.json
@@ -632,6 +632,7 @@
     "js": "rrLast"
   },
   "const git_error *": {
+    "cpp": "GitError",
     "js": "Error"
   },
   "giterr_clear": {
@@ -9251,5 +9252,165 @@
   "const git_blame_init_options *": {
     "cpp": "InitOptions",
     "js": "initOptions"
+  },
+  "git_buf": {
+    "cpp": "GitBuf",
+    "js": "Buf"
+  },
+  "git_buf **": {
+    "cpp": "GitBuf",
+    "js": "Buf"
+  },
+  "git_buf *": {
+    "cpp": "GitBuf",
+    "js": "Buf"
+  },
+  "const git_buf **": {
+    "cpp": "GitBuf",
+    "js": "Buf"
+  },
+  "const git_buf *": {
+    "cpp": "GitBuf",
+    "js": "Buf"
+  },
+  "git_cherry": {
+    "cpp": "GitCherry",
+    "js": "Cherry"
+  },
+  "git_cherry **": {
+    "cpp": "GitCherry",
+    "js": "Cherry"
+  },
+  "git_cherry *": {
+    "cpp": "GitCherry",
+    "js": "Cherry"
+  },
+  "const git_cherry **": {
+    "cpp": "GitCherry",
+    "js": "Cherry"
+  },
+  "const git_cherry *": {
+    "cpp": "GitCherry",
+    "js": "Cherry"
+  },
+  "git_cherry_pick_options": {
+    "cpp": "GitCherryPickOptions",
+    "js": "CherryPickOptions"
+  },
+  "git_cherry_pick_options **": {
+    "cpp": "GitCherryPickOptions",
+    "js": "CherryPickOptions"
+  },
+  "git_cherry_pick_options *": {
+    "cpp": "GitCherryPickOptions",
+    "js": "CherryPickOptions"
+  },
+  "const git_cherry_pick_options **": {
+    "cpp": "GitCherryPickOptions",
+    "js": "CherryPickOptions"
+  },
+  "const git_cherry_pick_options *": {
+    "cpp": "GitCherryPickOptions",
+    "js": "CherryPickOptions"
+  },
+  "git_merge_options": {
+    "cpp": "GitMergeOptions",
+    "js": "MergeOptions"
+  },
+  "git_merge_options **": {
+    "cpp": "GitMergeOptions",
+    "js": "MergeOptions"
+  },
+  "git_merge_options *": {
+    "cpp": "GitMergeOptions",
+    "js": "MergeOptions"
+  },
+  "const git_merge_options **": {
+    "cpp": "GitMergeOptions",
+    "js": "MergeOptions"
+  },
+  "const git_merge_options *": {
+    "cpp": "GitMergeOptions",
+    "js": "MergeOptions"
+  },
+  "git_error": {
+    "cpp": "GitError",
+    "js": "Error"
+  },
+  "git_error **": {
+    "cpp": "GitError",
+    "js": "Error"
+  },
+  "git_error *": {
+    "cpp": "GitError",
+    "js": "Error"
+  },
+  "const git_error **": {
+    "cpp": "GitError",
+    "js": "Error"
+  },
+  "git_cherry_pick": {
+    "cpp": "CherryPick",
+    "js": "cherryPick"
+  },
+  "git_cherry_pick **": {
+    "cpp": "GitCherryPick",
+    "js": "CherryPick"
+  },
+  "git_cherry_pick *": {
+    "cpp": "CherryPick",
+    "js": "cherryPick"
+  },
+  "const git_cherry_pick **": {
+    "cpp": "GitCherryPick",
+    "js": "CherryPick"
+  },
+  "const git_cherry_pick *": {
+    "cpp": "CherryPick",
+    "js": "cherryPick"
+  },
+  "git_cherrypick": {
+    "cpp": "GitCherrypick",
+    "js": "Cherrypick"
+  },
+  "git_cherrypick **": {
+    "cpp": "GitCherrypick",
+    "js": "Cherrypick"
+  },
+  "git_cherrypick *": {
+    "cpp": "GitCherrypick",
+    "js": "Cherrypick"
+  },
+  "const git_cherrypick **": {
+    "cpp": "GitCherrypick",
+    "js": "Cherrypick"
+  },
+  "const git_cherrypick *": {
+    "cpp": "GitCherrypick",
+    "js": "Cherrypick"
+  },
+  "git_cherry_pick_init_options": {
+    "cpp": "CherryPickInitOptions",
+    "js": "cherryPickInitOptions"
+  },
+  "git_cherry_pick_init_options *": {
+    "cpp": "CherryPickInitOptions",
+    "js": "cherryPickInitOptions"
+  },
+  "const git_cherry_pick_init_options *": {
+    "cpp": "CherryPickInitOptions",
+    "js": "cherryPickInitOptions"
+  },
+  "git_cherry_pick_commit": {
+    "cpp": "CherryPickCommit",
+    "js": "cherryPickCommit"
+  },
+  "git_cherry_pick_commit *": {
+    "cpp": "CherryPickCommit",
+    "js": "cherryPickCommit"
+  },
+  "const git_cherry_pick_commit *": {
+    "cpp": "CherryPickCommit",
+    "js": "cherryPickCommit"
   }
 }
\ No newline at end of file