proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-18 05:58:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

note: rename the id getter to git_note_id()

Browse Source 
This was left over when we did the general switch.
This commit is contained in:
Carlos Martín Nieto 2014-01-24 11:18:51 +01:00
parent ca55fc6356
commit d0a3de720e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/git2/notes.h
View File

@ -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

6
src/notes.c
View File

@ -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)

2
src/notes.h
View File

@ -21,7 +21,7 @@
"Notes removed by 'git_note_remove' from libgit2"
struct git_note {
git_oid oid;
git_oid id;
char *message;
};

4
tests/notes/notes.c
View File

@ -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);
}

4
tests/notes/notesref.c
View File

@ -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);