notes-merge: convert find_notes_merge_pair_ps to struct object_id

diff --git a/ref-filter.h b/ref-filter.h
index e738c5dfd364cf6e79ff48d5f154824fb94dc8a8..6552024f09e4d4d587eaf49377e7504a79818c1d 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -34,7 +34,7 @@ struct ref_sorting {
 };
 
 struct ref_array_item {
-       unsigned char objectname[20];
+       struct object_id objectname;
        int flag;
        unsigned int kind;
        const char *symref;
@@ -51,8 +51,9 @@ struct ref_array {
 
 struct ref_filter {
        const char **name_patterns;
-       struct sha1_array points_at;
+       struct oid_array points_at;
        struct commit_list *with_commit;
+       struct commit_list *no_commit;
 
        enum {
                REF_FILTER_MERGED_NONE = 0,