mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 07:36:14 +02:00
Code

upload-pack: pass upload_pack_data to got_oid() 

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to got_oid(), so that
this function can use all the fields of the struct.

This will be used in followup commits to move a static variable
into 'upload_pack_data'.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2020-06-11 14:05:16 +02:00 committed by Junio C Hamano
parent 0866734820
commit 460ed0d4b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
upload-pack.c
View File

@ -393,8 +393,8 @@ static void create_pack_file(struct upload_pack_data *pack_data)
die("git upload-pack: %s", abort_msg);
}
static int got_oid(const char *hex, struct object_id *oid,
struct object_array *have_obj)
static int got_oid(struct upload_pack_data *data,
const char *hex, struct object_id *oid)
{
struct object *o;
int we_knew_they_have = 0;
@ -422,7 +422,7 @@ static int got_oid(const char *hex, struct object_id *oid,
parents->item->object.flags |= THEY_HAVE;
}
if (!we_knew_they_have) {
add_object_array(o, NULL, have_obj);
add_object_array(o, NULL, &data->have_obj);
return 1;
}
return 0;
@ -478,7 +478,7 @@ static int get_common_commits(struct upload_pack_data *data,
continue;
}
if (skip_prefix(reader->line, "have ", &arg)) {
switch (got_oid(arg, &oid, &data->have_obj)) {
switch (got_oid(data, arg, &oid)) {
case -1: /* they have what we do not */
got_other = 1;
if (data->multi_ack