Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

diff --git a/send-pack.h b/send-pack.h
index 8ff1dc35390083c3648c4ee5790f35633d956069..1d7b1b3b4f41177dfd6637fcd98a0fc01f310c09 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -2,17 +2,16 @@
 #define SEND_PACK_H
 
 struct send_pack_args {
-       const char *receivepack;
        unsigned verbose:1,
-               send_all:1,
                send_mirror:1,
                force_update:1,
                use_thin_pack:1,
+               use_ofs_delta:1,
                dry_run:1;
 };
 
 int send_pack(struct send_pack_args *args,
-             const char *dest, struct remote *remote,
-             int nr_heads, const char **heads);
+             int fd[], struct child_process *conn,
+             struct ref *remote_refs, struct extra_have_objects *extra_have);
 
 #endif