avoid "write_in_full(fd, buf, len) != len" pattern

diff --git a/notes-utils.h b/notes-utils.h
index db5811e3f718e0dce7bc31e92cd05e481fe4376a..11905783989aa0d87be08e0c4311762b4647e9a4 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -37,9 +37,10 @@ struct notes_rewrite_cfg {
        int mode_from_env;
 };
 
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
 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);
 void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg);
 
 #endif