upload-pack: centralize setup of sideband-all config
We read uploadpack.allowsidebandall to set a matching flag in our upload_pack_data struct. But for our tests, we also respect GIT_TEST_SIDEBAND_ALL from the environment, and anybody looking at the flag in the struct needs to remember to check both. There's only one such piece of code now, but we're about to add another. So let's have the config step actually fold the environment value into the struct, letting the rest of the code use the flag in the obvious way. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 28, 2024 at 17:47 UTC
37aa89b068810d4ed7f262adcfecca1e07cf553c
1 file changed
+3
-2
upload-pack.c
+3
-2
@@ -1390,6 +1390,8 @@ static void get_upload_pack_config(struct repository *r,
1390
{
1391
repo_config(r, upload_pack_config, data);
1392
git_protected_config(upload_pack_protected_config, data);
1393
+
1394
+ data->allow_sideband_all |= git_env_bool("GIT_TEST_SIDEBAND_ALL", 0);
1395
}
1396
1397
void upload_pack(const int advertise_refs, const int stateless_rpc,
@@ -1639,8 +1641,7 @@ static void process_args(struct packet_reader *request,
1641
continue;
1642
}
1643
1642
- if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1643
- data->allow_sideband_all) &&
1644
+ if (data->allow_sideband_all &&
1645
!strcmp(arg, "sideband-all")) {
1646
data->writer.use_sideband = 1;
1647
continue;