Jeff King <peff@xxxxxxxx> writes: > There are some small textual conflicts with the series I just posted in: > > https://lore.kernel.org/git/20240228223700.GA1157826@xxxxxxxxxxxxxxxxxxxxxxx/ > > I'm happy to prepare this on top of that if it's easier. Thanks for a heads-up. The other one merged first and then this one does give the following, which does not look like a huge deal. diff --cc upload-pack.c index 281bdf85c9,66f4de9d87..0000000000 --- i/upload-pack.c +++ w/upload-pack.c @@@ -113,7 -113,7 +113,8 @@@ struct upload_pack_data unsigned done : 1; /* v2 only */ unsigned allow_ref_in_want : 1; /* v2 only */ unsigned allow_sideband_all : 1; /* v2 only */ + unsigned seen_haves : 1; /* v2 only */ + unsigned allow_packfile_uris : 1; /* v2 only */ unsigned advertise_sid : 1; unsigned sent_capabilities : 1; }; @@@ -1648,10 -1651,8 +1654,11 @@@ static void process_args(struct packet_ continue; } - if (skip_prefix(arg, "packfile-uris ", &p)) { + if (data->allow_packfile_uris && + skip_prefix(arg, "packfile-uris ", &p)) { + if (data->uri_protocols.nr) + send_err_and_die(data, + "multiple packfile-uris lines forbidden"); string_list_split(&data->uri_protocols, p, ',', -1); continue; }
