nodegit · srajko · Mar 23, 2016 · Mar 23, 2016 · Mar 24, 2016
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1767,6 +1767,7 @@
       "ignore": true
     },
     "repository": {
+      "cacheResult": true,
       "functions": {
         "git_repository__cleanup": {
           "ignore": true

diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -179,6 +179,7 @@ var Helpers = {
     typeDef.filename = typeDef.typeName;
     typeDef.isLibgitType = true;
     typeDef.dependencies = [];
+    typeDef.cacheResult = Boolean(typeDefOverrides.cacheResult);
     typeDef.selfFreeing = Boolean(typeDefOverrides.selfFreeing);
 
     if (typeDefOverrides.freeFunctionName) {

diff --git a/generate/templates/partials/sync_function.cc b/generate/templates/partials/sync_function.cc
@@ -2,6 +2,11 @@
 {%partial doc .%}
 NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
   Nan::EscapableHandleScope scope;
+
+{%if return.cacheResult %}
+  {{ cppClassName }} *thisObj = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info.This());
+  return info.GetReturnValue().Set(scope.Escape(Nan::New(thisObj->{{ cppFunctionName }}_cachedResult)));
+{% else %}
   {%partial guardArguments .%}
 
   {%each .|returnsInfo 'true' as _return %}
@@ -35,7 +40,7 @@ if (Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info.This())->GetValue() != NULL
 {% endif %}
 
   giterr_clear();
-  
+
   {
     LockMaster lockMaster(true{%each args|argsInfo as arg %}
       {%if arg.cType|isPointer%}{%if not arg.isReturn%}
@@ -125,4 +130,38 @@ if (Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info.This())->GetValue() != NULL
     {%endif%}
   {%endif%}
   }
+{%endif%}
 }
+
+{%if return.cacheResult %}
+void {{ cppClassName }}::{{ cppFunctionName }}_cache() {
+  if (!raw) {
+    {{ cppFunctionName }}_cachedResult.Reset(Nan::Null());
+    return;
+  }
+
+  LockMaster lockMaster(true{%each args|argsInfo as arg %}
+    {%if arg.cType|isPointer%}{%if not arg.isReturn%}
+      ,{%if arg.isSelf %}
+        raw
+    {%endif%}
+    {%endif%}{%endif%}
+  {%endeach%});
+
+  {{ return.cType }} result = {{ cFunctionName }}(
+  {%each args|argsInfo as arg %}
+    {%if arg.isSelf %}
+      raw
+    {%endif%}
+  {%endeach%}
+  );
+
+  Local<v8::Value> to;
+
+  {%each .|returnsInfo as _return %}
+    {%partial convertToV8 _return %}
+  {%endeach%}
+
+  {{ cppFunctionName }}_cachedResult.Reset(to);
+}
+{% endif %}
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -44,6 +44,16 @@ using namespace node;
       NonSelfFreeingConstructedCount++;
     }
 
+
+	{%each functions as function%}
+      {%if not function.ignore %}
+        {%if not function.isAsync %}
+          {%if function.return.cacheResult %}
+            {{ function.cppFunctionName }}_cache(); // populate cached value
+          {%endif%}
+        {%endif%}
+      {%endif%}
+    {%endeach%}
   }
 
   {{ cppClassName }}::~{{ cppClassName }}() {

diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
@@ -141,6 +141,14 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
       private:
         {{ function.cppFunctionName }}Baton *baton;
     };
+        {%else%}
+    {%if function.return.cacheResult %}
+    // For simple sync functions that return a wrapped object and pass `raw`
+    // as the the only parameter to libgit2, we cache the results.
+    // CopyablePersistentTraits are used to get the reset-on-destruct behavior.
+    void {{ function.cppFunctionName }}_cache();
+    Nan::Persistent<Value, Nan::CopyablePersistentTraits<Value> > {{ function.cppFunctionName }}_cachedResult;
+    {%endif%}
         {%endif%}
 
     static NAN_METHOD({{ function.cppFunctionName }});

diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -404,6 +404,12 @@ describe("Commit", function() {
     assert.ok(owner instanceof Repository);
   });
 
+  it("caches its owner", function() {
+    var owner = this.commit.owner();
+    var ownerAgain = this.commit.owner();
+    assert.ok(owner === ownerAgain);
+  });
+
   it("can walk its repository's history", function(done) {
     var historyCount = 0;
     var expectedHistoryCount = 364;

diff --git a/test/tests/submodule.js b/test/tests/submodule.js
@@ -134,7 +134,7 @@ describe("Submodule", function() {
         return reference.peel(NodeGit.Object.TYPE.COMMIT);
       })
       .then(function(commit) {
-        return submoduleRepo.createBranch("master", commit);
+        return submoduleRepo.createBranch("master", commit.id());
       })
       .then(function() {
         return submodule.addFinalize();