kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

upload-pack: move allow_ref_in_want to upload_pack_data 

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's move the 'allow_ref_in_want' static
variable into this struct.

It is used only by protocol v2 code.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 2020-06-04 19:54:48 +02:00 committed by Junio C Hamano
parent 59abe19624
commit d1d7a94526
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
upload-pack.c
View File

@ -55,8 +55,6 @@ static int shallow_nr;
static struct object_array extra_edge_obj; static struct object_array extra_edge_obj;
static const char *pack_objects_hook; static const char *pack_objects_hook;


static int allow_ref_in_want;

static int allow_sideband_all; static int allow_sideband_all;


/* /*
@ -104,6 +102,7 @@ struct upload_pack_data {
unsigned allow_filter : 1; unsigned allow_filter : 1;


unsigned done : 1; /* v2 only */ unsigned done : 1; /* v2 only */
unsigned allow_ref_in_want : 1; /* v2 only */
}; };


static void upload_pack_data_init(struct upload_pack_data *data) static void upload_pack_data_init(struct upload_pack_data *data)
@ -1145,7 +1144,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
} else if (!strcmp("uploadpack.allowfilter", var)) { } else if (!strcmp("uploadpack.allowfilter", var)) {
data->allow_filter = git_config_bool(var, value); data->allow_filter = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowrefinwant", var)) { } else if (!strcmp("uploadpack.allowrefinwant", var)) {
allow_ref_in_want = git_config_bool(var, value); data->allow_ref_in_want = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowsidebandall", var)) { } else if (!strcmp("uploadpack.allowsidebandall", var)) {
allow_sideband_all = git_config_bool(var, value); allow_sideband_all = git_config_bool(var, value);
} else if (!strcmp("core.precomposeunicode", var)) { } else if (!strcmp("core.precomposeunicode", var)) {
@ -1289,7 +1288,7 @@ static void process_args(struct packet_reader *request,
/* process want */ /* process want */
if (parse_want(&data->writer, arg, &data->want_obj)) if (parse_want(&data->writer, arg, &data->want_obj))
continue; continue;
if (allow_ref_in_want && if (data->allow_ref_in_want &&
parse_want_ref(&data->writer, arg, &data->wanted_refs, parse_want_ref(&data->writer, arg, &data->wanted_refs,
&data->want_obj)) &data->want_obj))
continue; continue;