From 59437a804062d859bd8495bc3b4b7a26472a02ef Mon Sep 17 00:00:00 2001
From: Tyler Ang-Wanek <tylerw@axosoft.com>
Date: Tue, 14 Jan 2020 10:21:12 -0700
Subject: [PATCH] Fix some issues from the libgit2 bump

---
 generate/input/descriptor.json         | 12 +-----------
 generate/input/libgit2-supplement.json |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index b52112a38..92772180c 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -396,16 +396,6 @@
               "jsClassName": "Buffer",
               "cType": "git_buf *",
               "shouldAlloc": true
-            },
-            "repo": {
-              "cppClassName": "GitRepository",
-              "jsClassName": "Repo",
-              "cType": "git_repository *"
-            },
-            "canonical_branch_name": {
-              "cppClassName": "String",
-              "jsClassName": "String",
-              "cType": "const char *"
             }
           },
           "return": {
@@ -415,7 +405,7 @@
         "git_branch_set_upstream": {
           "isAsync": true,
           "args": {
-            "upstream_name": {
+            "branch_name": {
               "isOptional": true
             }
           },
diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
index a9b64ea75..2115c41ba 100644
--- a/generate/input/libgit2-supplement.json
+++ b/generate/input/libgit2-supplement.json
@@ -1118,7 +1118,7 @@
             },
             {
               "name": "flags",
-              "type": "git_blob_filter_flag_t"
+              "type": "uint32_t"
             }
           ]
         }
@@ -1643,7 +1643,7 @@
               "name": "version"
             },
             {
-              "type": "git_stash_apply_flags",
+              "type": "uint32_t",
               "name": "flags"
             },
             {