nodegit · tbranyen · Oct 25, 2014 · Jul 18, 2014 · Oct 15, 2014 · Oct 15, 2014
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -30,6 +30,37 @@
  },

  "blame": {
+    "cType": "git_blame",
+    "forwardDeclare": true,
+
+    "functions": {
+      "git_blame_init_options": {
+        "ignore": false
+      },
+
+      "git_blame_get_hunk_count": {
+        "ignore": false,
+        "args": [{ "shouldAlloc": true }]
+      },
+
+      "git_blame_get_hunk_byindex": {
+        "ignore": false,
+        "args": [{ "shouldAlloc": true }]
+      },
+
+      "git_blame_get_hunk_byline": {
+        "ignore": false,
+        "args": [{ "shouldAlloc": true }]
+      },
+
+      "git_blame_file": {
+        "ignore": false
+      },
+
+      "git_blame_buffer": {
+        "ignore": false
+      }
+    }
  },

  "blob": {
@@ -85,7 +116,64 @@
  },

  "branch": {
-    "cType": null
+    "cType": "git_reference",
+    "altType": "git_branch",
+
+    "dependencies": [
+      "../include/wrapper.h",
+      "../include/commit.h",
+      "../include/refs.h",
+      "node_buffer.h"
+    ],
+
+    "functions": {
+      "git_branch_create": {
+        "ignore": false,
+        "isConstructorMethod": true
+      },
+
+      "git_branch_delete": {
+        "ignore": false
+      },
+
+      "git_branch_is_head": {
+        "ignore": false
+      },
+
+      "git_branch_iterator_free": {
+        "ignore": true
+      },
+
+      "git_branch_iterator_new": {
+        "ignore": true
+      },
+
+      "git_branch_lookup": {
+        "ignore": false,
+        "isConstructorMethod": true,
+        "args": [{}, {}, {}, { "isSelf": false }]
+      },
+
+      "git_branch_move": {
+        "ignore": false
+      },
+
+      "git_branch_name": {
+        "ignore": false
+      },
+
+      "git_branch_next": {
+        "ignore": true
+      },
+
+      "git_branch_set_upstream": {
+        "ignore": false
+      },
+
+      "git_branch_upstream": {
+        "ignore": false
+      }
+    }
  },

  "buffer": {

diff --git a/generate/filters/cpp_to_v8.js b/generate/filters/cpp_to_v8.js
@@ -1,5 +1,9 @@
 var isV8Value = require("./is_v8_value");

 module.exports = function(cppClassName) {
+  if (cppClassName === "Integer") {
+    cppClassName = "Number";
+  }
+
  return isV8Value(cppClassName) ? cppClassName : "Object";
 };
diff --git a/generate/partials/convert_from_v8.cc b/generate/partials/convert_from_v8.cc
@@ -4,11 +4,11 @@

  if (args[{{ jsArg }}]->Is{{ cppClassName|cppToV8 }}()) {
  {%endif%}
-  {%if cppClassName == 'String' %}
+  {%if cppClassName == 'String'%}

  String::Utf8Value {{ name }}(args[{{ jsArg }}]->ToString());
  from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
-  {%elsif cppClassName == 'Array' %}
+  {%elsif cppClassName == 'Array'%}

  Array *tmp_{{ name }} = Array::Cast(*args[{{ jsArg }}]);
  from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|replace '**' '*' }}));
@@ -18,8 +18,8 @@
    --%}
      from_{{ name }}[i] = ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(tmp_{{ name }}->Get(NanNew<Number>(static_cast<double>(i)))->ToObject())->GetValue();
      }
-  {%elsif cppClassName == 'Function' %}
-  {%elsif cppClassName == 'Buffer' %}
+  {%elsif cppClassName == 'Function'%}
+  {%elsif cppClassName == 'Buffer'%}

  from_{{ name }} = Buffer::Data(args[{{ jsArg }}]->ToObject());
  {%elsif cppClassName|isV8Value %}

diff --git a/generate/partials/doc.cc b/generate/partials/doc.cc
@@ -1,15 +1,15 @@
 /**
- {%each args as arg %}
-   {%if not arg.isReturn %}
-     {%if not arg.isSelf %}
+{%each args as arg %}
+  {%if not arg.isReturn %}
+    {%if not arg.isSelf %}
 * @param {{ arg.jsClassName }} {{ arg.name }}
-     {%endif%}
-   {%endif%}
- {%endeach%}{%each .|returnsInfo as returnInfo %}
-   {%if isAsync %}
+    {%endif%}
+  {%endif%}
+{%endeach%}{%each .|returnsInfo as returnInfo %}
+  {%if isAsync %}
 * @param {{ returnInfo.jsOrCppClassName }} callback
-   {%else%}
+  {%else%}
 * @return {{ returnInfo.jsOrCppClassName }} {%if returnInfo.name %}{{ returnInfo.name }}{%else%}result{%endif%}
-   {%endif%}
-   {%endeach%}
+  {%endif%}
+{%endeach%}
 */
diff --git a/generate/setup.js b/generate/setup.js
@@ -251,7 +251,7 @@ fileNames.forEach(function(fileName, index) {

    var funcDescriptor = libgit2.functions[functionName];
    var descriptor = {};
-    var cType = file.cType || "git_" + file.filename.slice(0, -2);
+    var cType = file.altType || file.cType || "git_" + file.filename.slice(0, -2);

    // From the hand maintained file.
    var functionDescriptor = functions ? functions[functionName] || ident : ident;

diff --git a/generate/templates/binding.gyp b/generate/templates/binding.gyp
@@ -50,6 +50,6 @@
          }
        ]
      ]
-    },
+    }
  ]
 }
diff --git a/generate/templates/class_content.cc b/generate/templates/class_content.cc
@@ -1,4 +1,4 @@
-// This is a generated file, modify: generate/templates/class.cc.
+// This is a generated file, modify: generate/templates/class_content.cc.
 #include <nan.h>
 #include <string.h>


diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -1,4 +1,4 @@
-// This is a generated file, modify: generate/templates/class.cc.
+// This is a generated file, modify: generate/templates/struct_content.cc.
 #include <nan.h>
 #include <string.h>
 #include <chrono>
-Original file line number
+Diff line change
@@ -50,6 +50,6 @@
               }
             ]
           ]
-        },
+        }
       ]
     }