Merge pull request nodegit#266 from nodegit/fix-attr-test

maxkorp · maxkorp · commit ec0811cf10f4 · 2014-11-11T10:39:23.000-07:00
voidcheck string pointers and reenable attr test
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -3,6 +3,14 @@
     "functions": {
       "git_attr_foreach": {
         "ignore": true
+      },
+      "git_attr_get": {
+        "isAsync": true,
+        "args": {
+          "value_out": {
+            "isReturn": true
+          }
+        }
       }
     }
   },
diff --git a/generate/partials/convert_to_v8.cc b/generate/partials/convert_to_v8.cc
@@ -1,12 +1,18 @@
 // start convert_to_v8 block
 {%if cppClassName == 'String' %}
+  if ({{= parsedName =}}){
   {%if size %}
-to = NanNew<String>({{= parsedName =}}, {{ size }});
+    to = NanNew<String>({{= parsedName =}}, {{ size }});
   {%elsif cType == 'char **' %}
-to = NanNew<String>(*{{= parsedName =}});
+
+    to = NanNew<String>(*{{= parsedName =}});
   {%else%}
-to = NanNew<String>({{= parsedName =}});
+    to = NanNew<String>({{= parsedName =}});
   {%endif%}
+  }
+  else {
+    to = NanNull();
+  }
 
   {%if freeFunctionName %}
 {{ freeFunctionName }}({{= parsedName =}});
diff --git a/test/tests/attr.js b/test/tests/attr.js
@@ -25,15 +25,8 @@ describe("Attr", function() {
     Attr.cacheFlush(this.repository);
   });
 
-  // FIXME Currently segfaults.
-  it.skip("can lookup the value of a git attribute", function() {
+  it("can lookup the value of a git attribute", function() {
     var flags = Attr.Check.NO_SYSTEM;
-    var getAttr = Attr.get(this.repository, flags, ".gitattributes", "test");
-
-    return getAttr.then(function(val) {
-      console.log(val);
-    }).catch(function(ex) {
-      console.log(ex);
-    });
+    Attr.get(this.repository, flags, ".gitattributes", "test");
   });
 });
