diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-12-05 20:02:29 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-10 16:14:15 -0800 |
| commit | 13eb4626c43b3116bb431671d593565eadc36852 (patch) | |
| tree | 01f7f161d5eedaaf3498eef791cbefbcf6234f68 /send-pack.c | |
| parent | 75f8cbab2a2ddc50728ade82baad223ed54bb040 (diff) | |
| download | git-13eb4626c43b3116bb431671d593565eadc36852.tar.gz git-13eb4626c43b3116bb431671d593565eadc36852.tar.xz | |
remote.h: replace struct extra_have_objects with struct sha1_array
The latter can do everything the former can and is used in many more
places.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/send-pack.c b/send-pack.c index fab62e3da..14005faef 100644 --- a/send-pack.c +++ b/send-pack.c @@ -10,6 +10,7 @@ #include "quote.h" #include "transport.h" #include "version.h" +#include "sha1-array.h" static int feed_object(const unsigned char *sha1, int fd, int negative) { @@ -28,7 +29,7 @@ static int feed_object(const unsigned char *sha1, int fd, int negative) /* * Make a pack stream and spit it out into file descriptor fd */ -static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args) +static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, struct send_pack_args *args) { /* * The child becomes pack-objects --revs; we feed @@ -71,7 +72,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext * parameters by writing to the pipe. */ for (i = 0; i < extra->nr; i++) - if (!feed_object(extra->array[i], po.in, 1)) + if (!feed_object(extra->sha1[i], po.in, 1)) break; while (refs) { @@ -177,7 +178,7 @@ static int sideband_demux(int in, int out, void *data) 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 sha1_array *extra_have) { int in = fd[0]; int out = fd[1]; |