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

upload-pack: actually use some upload_pack_data bitfields 

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's actually start using some bitfields of
that struct. These bitfields were introduced in 3145ea957d
("upload-pack: introduce fetch server command", 2018-03-15), but
were never used.

We could instead have just removed the following bitfields
from the struct:

unsigned use_thin_pack : 1;
unsigned use_ofs_delta : 1;
unsigned no_progress : 1;
unsigned use_include_tag : 1;

but using them makes it possible to remove a number of static
variables with the same name and purpose from 'upload-pack.c'.

This is a behavior change, as we accidentally used to let values
in those bitfields propagate from one v2 "fetch" command to
another for ssh/git/file connections (but not for http). That's
fixing a bug, but one nobody is likely to see, because it would
imply the client sending different capabilities for each request.

Helped-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Jeff King <peff@peff.net>
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
Jeff King 2020-06-04 19:54:38 +02:00 committed by Junio C Hamano
parent 7a516764a3
commit b5a2068cb1
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
upload-pack.c
View File

@ -46,8 +46,7 @@ static timestamp_t oldest_have;


static int multi_ack; static int multi_ack;
static int no_done; static int no_done;
static int use_thin_pack, use_ofs_delta, use_include_tag; static int daemon_mode;
static int no_progress, daemon_mode;
/* Allow specifying sha1 if it is a ref tip. */ /* Allow specifying sha1 if it is a ref tip. */
#define ALLOW_TIP_SHA1 01 #define ALLOW_TIP_SHA1 01
/* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
@ -186,17 +185,17 @@ static void create_pack_file(struct upload_pack_data *pack_data)
} }
argv_array_push(&pack_objects.args, "pack-objects"); argv_array_push(&pack_objects.args, "pack-objects");
argv_array_push(&pack_objects.args, "--revs"); argv_array_push(&pack_objects.args, "--revs");
if (use_thin_pack) if (pack_data->use_thin_pack)
argv_array_push(&pack_objects.args, "--thin"); argv_array_push(&pack_objects.args, "--thin");


argv_array_push(&pack_objects.args, "--stdout"); argv_array_push(&pack_objects.args, "--stdout");
if (shallow_nr) if (shallow_nr)
argv_array_push(&pack_objects.args, "--shallow"); argv_array_push(&pack_objects.args, "--shallow");
if (!no_progress) if (!pack_data->no_progress)
argv_array_push(&pack_objects.args, "--progress"); argv_array_push(&pack_objects.args, "--progress");
if (use_ofs_delta) if (pack_data->use_ofs_delta)
argv_array_push(&pack_objects.args, "--delta-base-offset"); argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag) if (pack_data->use_include_tag)
argv_array_push(&pack_objects.args, "--include-tag"); argv_array_push(&pack_objects.args, "--include-tag");
if (pack_data->filter_options.choice) { if (pack_data->filter_options.choice) {
const char *spec = const char *spec =
@ -955,17 +954,17 @@ static void receive_needs(struct upload_pack_data *data,
if (parse_feature_request(features, "no-done")) if (parse_feature_request(features, "no-done"))
no_done = 1; no_done = 1;
if (parse_feature_request(features, "thin-pack")) if (parse_feature_request(features, "thin-pack"))
use_thin_pack = 1; data->use_thin_pack = 1;
if (parse_feature_request(features, "ofs-delta")) if (parse_feature_request(features, "ofs-delta"))
use_ofs_delta = 1; data->use_ofs_delta = 1;
if (parse_feature_request(features, "side-band-64k")) if (parse_feature_request(features, "side-band-64k"))
use_sideband = LARGE_PACKET_MAX; use_sideband = LARGE_PACKET_MAX;
else if (parse_feature_request(features, "side-band")) else if (parse_feature_request(features, "side-band"))
use_sideband = DEFAULT_PACKET_MAX; use_sideband = DEFAULT_PACKET_MAX;
if (parse_feature_request(features, "no-progress")) if (parse_feature_request(features, "no-progress"))
no_progress = 1; data->no_progress = 1;
if (parse_feature_request(features, "include-tag")) if (parse_feature_request(features, "include-tag"))
use_include_tag = 1; data->use_include_tag = 1;
if (allow_filter && parse_feature_request(features, "filter")) if (allow_filter && parse_feature_request(features, "filter"))
filter_capability_requested = 1; filter_capability_requested = 1;


@ -997,7 +996,7 @@ static void receive_needs(struct upload_pack_data *data,
check_non_tip(data); check_non_tip(data);


if (!use_sideband && daemon_mode) if (!use_sideband && daemon_mode)
no_progress = 1; data->no_progress = 1;


if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0) if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
return; return;
@ -1279,19 +1278,19 @@ static void process_args(struct packet_reader *request,


/* process args like thin-pack */ /* process args like thin-pack */
if (!strcmp(arg, "thin-pack")) { if (!strcmp(arg, "thin-pack")) {
use_thin_pack = 1; data->use_thin_pack = 1;
continue; continue;
} }
if (!strcmp(arg, "ofs-delta")) { if (!strcmp(arg, "ofs-delta")) {
use_ofs_delta = 1; data->use_ofs_delta = 1;
continue; continue;
} }
if (!strcmp(arg, "no-progress")) { if (!strcmp(arg, "no-progress")) {
no_progress = 1; data->no_progress = 1;
continue; continue;
} }
if (!strcmp(arg, "include-tag")) { if (!strcmp(arg, "include-tag")) {
use_include_tag = 1; data->use_include_tag = 1;
continue; continue;
} }
if (!strcmp(arg, "done")) { if (!strcmp(arg, "done")) {