Fix up Diff.blobToBuffer

John Haley · John Haley · commit a0a16540d5c3 · 2015-04-20T21:29:36.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -524,6 +524,35 @@
       ],
       "functions": {
         "git_diff_blob_to_buffer": {
+          "args": {
+            "old_blob" : {
+              "isOptional": true
+            },
+            "old_as_path" : {
+              "isOptional": true
+            },
+            "buffer" : {
+              "isOptional": true
+            },
+            "buffer_len" : {
+              "isOptional": true
+            },
+            "buffer_as_path" : {
+              "isOptional": true
+            },
+            "options" : {
+              "isOptional": true
+            },
+            "file_cb" : {
+              "isOptional": true
+            },
+            "hunk_cb" : {
+              "isOptional": true
+            },
+            "line_cb" : {
+              "isOptional": true
+            }
+          },
           "return": {
             "isErrorCode": true
           },
diff --git a/lib/diff.js b/lib/diff.js
@@ -63,9 +63,30 @@ Diff.prototype.findSimilar = function(opts) {
   return findSimilar.call(this, opts);
 };
 
-var blobToBuffer = Diff.prototype.blobToBuffer;
-Diff.prototype.blobToBuffer = function(old_blob, old_as_path, buffer, buffer_length, buffer_as_path, opts, file_cb, hunk_cb, line_cb) {
-  console.log("********************************");
+var blobToBuffer = Diff.blobToBuffer;
+Diff.blobToBuffer= function(
+    old_blob,
+    old_as_path,
+    buffer,
+    buffer_as_path,
+    opts,
+    file_cb,
+    hunk_cb,
+    line_cb) {
+  var bufferLength = !buffer ? 0 : buffer.length;
+
   opts = normalizeOptions(opts, NodeGit.DiffOptions);
-  return blobToBuffer.call(this, old_blob, old_as_path, buffer, buffer_length, buffer_as_path, opts, file_cb, hunk_cb, line_cb);
+
+  return blobToBuffer.call(
+    this,
+    old_blob,
+    old_as_path,
+    buffer,
+    bufferLength,
+    buffer_as_path,
+    opts,
+    file_cb,
+    hunk_cb,
+    line_cb,
+    null);
 };
diff --git a/test/tests/diff.js b/test/tests/diff.js
@@ -145,28 +145,28 @@ describe("Diff", function() {
     });
   });
 
-  it("can diff the contents of a file to the index", function(done) {
+  it("can diff the contents of a file to a string", function(done) {
     this.repository.getBranchCommit("master")
       .then(function(commit) {
-        var difffile = "LICENSE";
-        return commit.getEntry(difffile);
+        return commit.getEntry("LICENSE");
       })
       .then(function(entry) {
         var _entry = entry;
         return _entry.getBlob();
       })
       .then(function(blob) {
         var buffer = "New Text";
-        console.log(buffer, buffer.length);
-        Diff.blobToBuffer(blob, null, buffer, buffer.length, null, null, null, function() {
-          console.log('delta');
-          done();
-        }, null, null);
-      }, function(error) {
-        console.log('Error', error);
-        throw new Error(error);
-      })
-
+        return Diff.blobToBuffer(
+          blob,
+          null,
+          buffer,
+          null,
+          null,
+          null,
+          function() {
+            console.log("delta");
+          });
+      });
   });
 
   it("can diff with a null tree", function() {
