revision --simplify-merges: use decoration instead of commit->util field

diff --git a/pack.h b/pack.h
index b57ba2d9ed6120612c2576b07d8c185d4b54bb76..76e6aa2aad06545e7c44fc2c1e117ea668356ccf 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -55,9 +55,9 @@ struct pack_idx_entry {
        off_t offset;
 };
 
-extern const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
-
-extern int verify_pack(struct packed_git *, int);
+extern char *write_idx_file(char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
+extern int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
+extern int verify_pack(struct packed_git *);
 extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t);
 extern char *index_pack_lockfile(int fd);