Merge branch 'sd/t3200-branch-m-test'

diff --git a/notes-utils.c b/notes-utils.c
index 031503d7b2ba9217cffa52652b57aa063208fb1a..9ebf8419565019cca42d778be96e2f3b7d6f29df 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -158,7 +158,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
 }
 
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
-                         const unsigned char *from_obj, const unsigned char *to_obj)
+                         const struct object_id *from_obj, const struct object_id *to_obj)
 {
        int ret = 0;
        int i;