diff --git a/‎generate/input/callbacks.json‎
Lines changed: 6 additions & 2 deletions b/‎generate/input/callbacks.json‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎generate/input/descriptor.json‎
Lines changed: 10 additions & 1 deletion b/‎generate/input/descriptor.json‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎lib/note.js‎
Lines changed: 9 additions & 0 deletions b/‎lib/note.js‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎test/tests/note.js‎
Lines changed: 24 additions & 7 deletions b/‎test/tests/note.js‎
Lines changed: 24 additions & 7 deletions
@@ -273,7 +273,11 @@
   "git_note_foreach_cb": {
     "args": [
       {
-        "name": "id",
+        "name": "blob_id",
+        "cType": "const git_oid *"
+      },
+      {
+        "name": "annotated_object_id",
         "cType": "const git_oid *"
       },
       {
@@ -283,7 +287,7 @@
     ],
     "return": {
       "type": "int",
-      "noResults": 1,
+      "noResults": 0,
       "success": 0,
       "error": -1
     }
 
@@ -944,8 +944,17 @@
             }
           }
         },
+        "git_note_remove": {
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
+        },
         "git_note_foreach": {
-          "ignore": true
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
         }
       }
     },
 
@@ -0,0 +1,9 @@
+var NodeGit = require("../");
+
+var Note = NodeGit.Note;
+
+// Override Note.foreach to eliminate the need to pass null payload
+var foreach = Note.foreach;
+Note.foreach = function(repo, notesRef, callback) {
+  return foreach(repo, notesRef, callback, null);
+};
@@ -6,7 +6,7 @@ describe("Note", function() {
   var NodeGit = require("../../");
   var Note = NodeGit.Note;
   var Signature = NodeGit.Signature;
-  var reposPath = local("../repos/merge");
+  var reposPath = local("../../");
 
   beforeEach(function() {
     var test = this;
@@ -37,16 +37,33 @@ describe("Note", function() {
     });
   });
 
+  it("can iterate all notes", function() {
+    var test = this;
+    var noteRef = "refs/notes/commits";
+    var ref = null;
+
+    return Note.foreach(this.repository, noteRef, function(blobId, objectId) {
+      ref = objectId;
+    }).then(function() {
+      return NodeGit.Note.read(test.repository, noteRef, ref)
+        .then(function(note) {
+          assert.equal(note.message(), "Testing!");
+        });
+    });
+  });
+
   it("can be removed", function(done) {
+    var test = this;
     var sha = this.commit.id();
     var noteRef = "refs/notes/commits";
     var sig = Signature.create("John", "john@doe.com", Date.now(), 0);
 
-    Note.remove(this.repository, noteRef, sig, sig, sha);
-
-    return Note.read(this.repository, noteRef, sha).catch(function(ex) {
-      assert.equal(ex.message, "Note could not be found");
-      done();
-    });
+    return Note.remove(this.repository, noteRef, sig, sig, sha)
+      .then(function() {
+        return Note.read(test.repository, noteRef, sha).catch(function(ex) {
+          assert.equal(ex.message, "Note could not be found");
+          done();
+        });
+      });
   });
 });
Original file line number	Diff line number	Diff line change
@@ -944,8 +944,17 @@
944	944	}
945	945	}
946	946	},
	947	+ "git_note_remove": {
	948	+ "isAsync": true,
	949	+ "return": {
	950	+ "isErrorCode": true
	951	+ }
	952	+ },
947	953	"git_note_foreach": {
948		- "ignore": true
	954	+ "isAsync": true,
	955	+ "return": {
	956	+ "isErrorCode": true
	957	+ }
949	958	}
950	959	}
951	960	},