Merge branch 'jc/add-u-A-default-to-top' into maint

diff --git a/notes.c b/notes.c
index d46520054123bd52d10496bb09b67725ea0614d5..eacd2a61daf9b4133e81a936340abc63c1078a48 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -919,7 +919,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;