Merge branch 'master' into next

diff --git a/pack.h b/pack.h
index 9dafa2b6d2c76919594218b12a2a36bd9067f2b7..694e0c56f0b67c1ae9b7a94a243aca7b8859e50c 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -29,5 +29,7 @@ struct pack_header {
 };
 
 extern int verify_pack(struct packed_git *, int);
-
+extern int check_reuse_pack_delta(struct packed_git *, unsigned long,
+                                 unsigned char *, unsigned long *,
+                                 enum object_type *);
 #endif