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>
Christian Couder committed
Jun 4, 2020 at 19:54 UTC
d1d7a9452629a6caa26e80bd6ca69366ff65dd89
1 file changed
+3
-4
upload-pack.c
+3
-4
@@ -55,8 +55,6 @@ static int shallow_nr;
55
static struct object_array extra_edge_obj;
56
static const char *pack_objects_hook;
57
58
-static int allow_ref_in_want;
59
-
58
static int allow_sideband_all;
59
60
/*
@@ -104,6 +102,7 @@ struct upload_pack_data {
102
unsigned allow_filter : 1;
103
104
unsigned done : 1; /* v2 only */
105
+ unsigned allow_ref_in_want : 1; /* v2 only */
106
};
107
108
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)
1144
} else if (!strcmp("uploadpack.allowfilter", var)) {
1145
data->allow_filter = git_config_bool(var, value);
1146
} else if (!strcmp("uploadpack.allowrefinwant", var)) {
1148
- allow_ref_in_want = git_config_bool(var, value);
1147
+ data->allow_ref_in_want = git_config_bool(var, value);
1148
} else if (!strcmp("uploadpack.allowsidebandall", var)) {
1149
allow_sideband_all = git_config_bool(var, value);
1150
} else if (!strcmp("core.precomposeunicode", var)) {
@@ -1289,7 +1288,7 @@ static void process_args(struct packet_reader *request,
1288
/* process want */
1289
if (parse_want(&data->writer, arg, &data->want_obj))
1290
continue;
1292
- if (allow_ref_in_want &&
1291
+ if (data->allow_ref_in_want &&
1292
parse_want_ref(&data->writer, arg, &data->wanted_refs,
1293
&data->want_obj))
1294
continue;