Second batch for 2.6

diff --git a/notes.c b/notes.c
index 2be4d7f3fd081476001212b103f011e45b4a9c41..df08209dee498d624817f071d7e9ac5194d2334f 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -918,7 +918,7 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
        return ret;
 }
 
-static int string_list_add_one_ref(const char *refname, const unsigned char *sha1,
+static int string_list_add_one_ref(const char *refname, const struct object_id *oid,
                                   int flag, void *cb)
 {
        struct string_list *refs = cb;