Skip to content

Commit

Permalink
upload-pack: move allow_sideband_all to upload_pack_data
Browse files Browse the repository at this point in the history
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's move the 'allow_sideband_all' static
variable into this struct.

It is used only by protocol v2 code.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
chriscool authored and gitster committed May 27, 2020
1 parent 7d332cf commit 20a359e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions upload-pack.c
Expand Up @@ -55,8 +55,6 @@ static int shallow_nr;
static struct object_array extra_edge_obj;
static const char *pack_objects_hook;

static int allow_sideband_all;

struct upload_pack_data {
struct string_list symref;
struct string_list wanted_refs;
Expand Down Expand Up @@ -99,6 +97,7 @@ struct upload_pack_data {

unsigned allow_filter : 1;
unsigned allow_ref_in_want : 1;
unsigned allow_sideband_all : 1;
};

static void upload_pack_data_init(struct upload_pack_data *data)
Expand Down Expand Up @@ -1142,7 +1141,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
} else if (!strcmp("uploadpack.allowrefinwant", var)) {
data->allow_ref_in_want = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowsidebandall", var)) {
allow_sideband_all = git_config_bool(var, value);
data->allow_sideband_all = git_config_bool(var, value);
} else if (!strcmp("core.precomposeunicode", var)) {
precomposed_unicode = git_config_bool(var, value);
}
Expand Down Expand Up @@ -1337,7 +1336,7 @@ static void process_args(struct packet_reader *request,
}

if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
allow_sideband_all) &&
data->allow_sideband_all) &&
!strcmp(arg, "sideband-all")) {
data->writer.use_sideband = 1;
continue;
Expand Down

0 comments on commit 20a359e

Please sign in to comment.