mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: move pack_objects_hook to upload_pack_data

Browse Source 
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's move the 'pack_objects_hook' static
variable into this struct.

It is used by code common to protocol v0 and protocol v2.

While at it let's also free() it in upload_pack_data_clear().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2020-06-04 19:54:50 +02:00 committed by Junio C Hamano
parent e3835cd4bc
commit 339a9840ef
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
upload-pack.c
View File

@ -53,7 +53,6 @@ static timestamp_t oldest_have;
static unsigned int allow_unadvertised_object_request; static unsigned int allow_unadvertised_object_request;
static int shallow_nr; static int shallow_nr;
static struct object_array extra_edge_obj; static struct object_array extra_edge_obj;
static const char *pack_objects_hook;
/* /*
* Please annotate, and if possible group together, fields used only * Please annotate, and if possible group together, fields used only
@ -88,6 +87,8 @@ struct upload_pack_data {
struct packet_writer writer; struct packet_writer writer;
const char *pack_objects_hook;
unsigned stateless_rpc : 1; /* v0 only */ unsigned stateless_rpc : 1; /* v0 only */
unsigned no_done : 1; /* v0 only */ unsigned no_done : 1; /* v0 only */
unsigned daemon_mode : 1; /* v0 only */ unsigned daemon_mode : 1; /* v0 only */
@ -137,6 +138,8 @@ static void upload_pack_data_clear(struct upload_pack_data *data)
object_array_clear(&data->shallows); object_array_clear(&data->shallows);
string_list_clear(&data->deepen_not, 0); string_list_clear(&data->deepen_not, 0);
list_objects_filter_release(&data->filter_options); list_objects_filter_release(&data->filter_options);
free((char *)data->pack_objects_hook);
} }
static void reset_timeout(unsigned int timeout) static void reset_timeout(unsigned int timeout)
@ -181,10 +184,10 @@ static void create_pack_file(struct upload_pack_data *pack_data)
int i; int i;
FILE *pipe_fd; FILE *pipe_fd;
if (!pack_objects_hook) if (!pack_data->pack_objects_hook)
pack_objects.git_cmd = 1; pack_objects.git_cmd = 1;
else { else {
argv_array_push(&pack_objects.args, pack_objects_hook); argv_array_push(&pack_objects.args, pack_data->pack_objects_hook);
argv_array_push(&pack_objects.args, "git"); argv_array_push(&pack_objects.args, "git");
pack_objects.use_shell = 1; pack_objects.use_shell = 1;
} }
@ -1153,7 +1156,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
if (current_config_scope() != CONFIG_SCOPE_LOCAL && if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
current_config_scope() != CONFIG_SCOPE_WORKTREE) { current_config_scope() != CONFIG_SCOPE_WORKTREE) {
if (!strcmp("uploadpack.packobjectshook", var)) if (!strcmp("uploadpack.packobjectshook", var))
return git_config_string(&pack_objects_hook, var, value); return git_config_string(&data->pack_objects_hook, var, value);
} }
return parse_hide_refs_config(var, value, "uploadpack"); return parse_hide_refs_config(var, value, "uploadpack");