Merge git://ozlabs.org/~paulus/gitk

diff --git a/send-pack.h b/send-pack.h
index 05d7ab118b3e1473cdf559d3f6337b26bb9aac81..8e843924cf5beba6ee680149910cd357cffc73e3 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -16,6 +16,6 @@ struct send_pack_args {
 
 int send_pack(struct send_pack_args *args,
              int fd[], struct child_process *conn,
-             struct ref *remote_refs, struct extra_have_objects *extra_have);
+             struct ref *remote_refs, struct sha1_array *extra_have);
 
 #endif