note: rename the id getter to git_note_id()

This was left over when we did the general switch.

5 files changed, 11 insertions, 11 deletions

diff --git a/include/git2/notes.h b/include/git2/notes.h
index 0cb6ce5f1..98eb2aef3 100644
--- a/include/git2/notes.h
+++ b/include/git2/notes.h
@@ -106,12 +106,12 @@ GIT_EXTERN(const char *) git_note_message(const git_note *note);
 
 
 /**
- * Get the note object OID
+ * Get the note object's id
  *
  * @param note the note
- * @return the note object OID
+ * @return the note object's id
  */
-GIT_EXTERN(const git_oid *) git_note_oid(const git_note *note);
+GIT_EXTERN(const git_oid *) git_note_id(const git_note *note);
 
 /**
  * Add a note for an object
diff --git a/src/notes.c b/src/notes.c
index 795904917..1ff0e35c3 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -313,7 +313,7 @@ static int note_new(git_note **out, git_oid *note_oid, git_blob *blob)
 	note = (git_note *)git__malloc(sizeof(git_note));
 	GITERR_CHECK_ALLOC(note);
 
-	git_oid_cpy(&note->oid, note_oid);
+	git_oid_cpy(&note->id, note_oid);
 	note->message = git__strdup((char *)git_blob_rawcontent(blob));
 	GITERR_CHECK_ALLOC(note->message);
 
@@ -508,10 +508,10 @@ const char * git_note_message(const git_note *note)
 	return note->message;
 }
 
-const git_oid * git_note_oid(const git_note *note)
+const git_oid * git_note_id(const git_note *note)
 {
 	assert(note);
-	return &note->oid;
+	return &note->id;
 }
 
 void git_note_free(git_note *note)
diff --git a/src/notes.h b/src/notes.h
index 39e18b621..e9cfa00fa 100644
--- a/src/notes.h
+++ b/src/notes.h
@@ -21,7 +21,7 @@
 	"Notes removed by 'git_note_remove' from libgit2"
 
 struct git_note {
-	git_oid oid;
+	git_oid id;
 
 	char *message;
 };
diff --git a/tests/notes/notes.c b/tests/notes/notes.c
index c2579a2c4..e48d9df0e 100644
--- a/tests/notes/notes.c
+++ b/tests/notes/notes.c
@@ -21,7 +21,7 @@ static void assert_note_equal(git_note *note, char *message, git_oid *note_oid)
 	git_blob *blob;
 
 	cl_assert_equal_s(git_note_message(note), message);
-	cl_assert(!git_oid_cmp(git_note_oid(note), note_oid));
+	cl_assert(!git_oid_cmp(git_note_id(note), note_oid));
 
 	cl_git_pass(git_blob_lookup(&blob, _repo, note_oid));
 	cl_assert_equal_s(git_note_message(note), (const char *)git_blob_rawcontent(blob));
@@ -290,7 +290,7 @@ void test_notes_notes__can_read_a_note_in_an_existing_fanout(void)
 	cl_git_pass(git_note_read(&note, _repo, "refs/notes/fanout", &target_oid));
 
 	cl_git_pass(git_oid_fromstr(&note_oid, "08b041783f40edfe12bb406c9c9a8a040177c125"));
-	cl_assert(!git_oid_cmp(git_note_oid(note), &note_oid));
+	cl_assert(!git_oid_cmp(git_note_id(note), &note_oid));
 
 	git_note_free(note);
 }
diff --git a/tests/notes/notesref.c b/tests/notes/notesref.c
index c89b71ba5..a33141979 100644
--- a/tests/notes/notesref.c
+++ b/tests/notes/notesref.c
@@ -46,13 +46,13 @@ void test_notes_notesref__config_corenotesref(void)
 
 	cl_git_pass(git_note_read(&_note, _repo, NULL, &oid));
 	cl_assert_equal_s("test123test\n", git_note_message(_note));
-	cl_assert(!git_oid_cmp(git_note_oid(_note), &note_oid));
+	cl_assert(!git_oid_cmp(git_note_id(_note), &note_oid));
 
 	git_note_free(_note);
 
 	cl_git_pass(git_note_read(&_note, _repo, "refs/notes/mydefaultnotesref", &oid));
 	cl_assert_equal_s("test123test\n", git_note_message(_note));
-	cl_assert(!git_oid_cmp(git_note_oid(_note), &note_oid));
+	cl_assert(!git_oid_cmp(git_note_id(_note), &note_oid));
 
 	cl_git_pass(git_note_default_ref(&default_ref, _repo));
 	cl_assert_equal_s("refs/notes/mydefaultnotesref", default_ref);