diff options
| author | Christian Couder <christian.couder@gmail.com> | 2020-05-15 10:04:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-18 19:58:02 (GMT) |
| commit | b08c97423fa3f55c1b40eb4b3604c4f990dd955b (patch) | |
| tree | ddbf862cfcf2602fe15b082b36957b72363e1e24 /upload-pack.c | |
| parent | 762f92767c5d1f1d708f6656363f26bfb700f83a (diff) | |
| download | git-b08c97423fa3f55c1b40eb4b3604c4f990dd955b.zip git-b08c97423fa3f55c1b40eb4b3604c4f990dd955b.tar.gz git-b08c97423fa3f55c1b40eb4b3604c4f990dd955b.tar.bz2 | |
upload-pack: pass upload_pack_data to check_non_tip()
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to check_non_tip(), so
that this function and the functions it calls, can use all the
fields of the struct in followup commits.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/upload-pack.c b/upload-pack.c index bc259f1..680c38c 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -654,8 +654,7 @@ error: return 1; } -static void check_non_tip(struct object_array *want_obj, - struct packet_writer *writer) +static void check_non_tip(struct upload_pack_data *data) { int i; @@ -666,16 +665,16 @@ static void check_non_tip(struct object_array *want_obj, */ if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1)) goto error; - if (!has_unreachable(want_obj)) + if (!has_unreachable(&data->want_obj)) /* All the non-tip ones are ancestors of what we advertised */ return; error: /* Pick one of them (we know there at least is one) */ - for (i = 0; i < want_obj->nr; i++) { - struct object *o = want_obj->objects[i].item; + for (i = 0; i < data->want_obj.nr; i++) { + struct object *o = data->want_obj.objects[i].item; if (!is_our_ref(o)) { - packet_writer_error(writer, + packet_writer_error(&data->writer, "upload-pack: not our ref %s", oid_to_hex(&o->oid)); die("git upload-pack: not our ref %s", @@ -1003,7 +1002,7 @@ static void receive_needs(struct upload_pack_data *data, * by another process that handled the initial request. */ if (has_non_tip) - check_non_tip(&data->want_obj, &data->writer); + check_non_tip(data); if (!use_sideband && daemon_mode) no_progress = 1; |