Merge http://www.kernel.org/pub/scm/gitk/gitk

diff --git a/pack.h b/pack.h
index 598477a525e23b2ed0e66ffcb094af83bab70006..657deaa3f43ebe8627caa93798dd8ae5d956601d 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -27,6 +27,6 @@ struct pack_header {
        unsigned int hdr_entries;
 };
 
-extern int verify_pack(struct packed_git *);
+extern int verify_pack(struct packed_git *, int);
 
 #endif