undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: pass upload_pack_data to create_pack_file()

Browse Source 
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to create_pack_file(),
so that this function, and the function it calls, can use all
the fields of the struct.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2020-05-15 12:04:53 +02:00 committed by Junio C Hamano
parent df654abccc
commit c9f0325905
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
upload-pack.c
View File

@ -161,9 +161,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
return 0; return 0;
} }
static void create_pack_file(const struct object_array *have_obj, static void create_pack_file(struct upload_pack_data *pack_data)
const struct object_array *want_obj,
struct list_objects_filter_options *filter_options)
{ {
struct child_process pack_objects = CHILD_PROCESS_INIT; struct child_process pack_objects = CHILD_PROCESS_INIT;
char data[8193], progress[128]; char data[8193], progress[128];
@ -200,9 +198,9 @@ static void create_pack_file(const struct object_array *have_obj,
argv_array_push(&pack_objects.args, "--delta-base-offset"); argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag) if (use_include_tag)
argv_array_push(&pack_objects.args, "--include-tag"); argv_array_push(&pack_objects.args, "--include-tag");
if (filter_options->choice) { if (pack_data->filter_options.choice) {
const char *spec = const char *spec =
expand_list_objects_filter_spec(filter_options); expand_list_objects_filter_spec(&pack_data->filter_options);
if (pack_objects.use_shell) { if (pack_objects.use_shell) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
sq_quote_buf(&buf, spec); sq_quote_buf(&buf, spec);
@ -226,13 +224,13 @@ static void create_pack_file(const struct object_array *have_obj,
if (shallow_nr) if (shallow_nr)
for_each_commit_graft(write_one_shallow, pipe_fd); for_each_commit_graft(write_one_shallow, pipe_fd);
for (i = 0; i < want_obj->nr; i++) for (i = 0; i < pack_data->want_obj.nr; i++)
fprintf(pipe_fd, "%s\n", fprintf(pipe_fd, "%s\n",
oid_to_hex(&want_obj->objects[i].item->oid)); oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
fprintf(pipe_fd, "--not\n"); fprintf(pipe_fd, "--not\n");
for (i = 0; i < have_obj->nr; i++) for (i = 0; i < pack_data->have_obj.nr; i++)
fprintf(pipe_fd, "%s\n", fprintf(pipe_fd, "%s\n",
oid_to_hex(&have_obj->objects[i].item->oid)); oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
for (i = 0; i < extra_edge_obj.nr; i++) for (i = 0; i < extra_edge_obj.nr; i++)
fprintf(pipe_fd, "%s\n", fprintf(pipe_fd, "%s\n",
oid_to_hex(&extra_edge_obj.objects[i].item->oid)); oid_to_hex(&extra_edge_obj.objects[i].item->oid));
@ -1179,9 +1177,7 @@ void upload_pack(struct upload_pack_options *options)
receive_needs(&data, &reader); receive_needs(&data, &reader);
if (data.want_obj.nr) { if (data.want_obj.nr) {
get_common_commits(&data, &reader); get_common_commits(&data, &reader);
create_pack_file(&data.have_obj, create_pack_file(&data);
&data.want_obj,
&data.filter_options);
} }
} }
@ -1525,9 +1521,7 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys,
send_shallow_info(&data); send_shallow_info(&data);
packet_writer_write(&data.writer, "packfile\n"); packet_writer_write(&data.writer, "packfile\n");
create_pack_file(&data.have_obj, create_pack_file(&data);
&data.want_obj,
&data.filter_options);
state = FETCH_DONE; state = FETCH_DONE;
break; break;
case FETCH_DONE: case FETCH_DONE: