Merge branch 'js/msvc-build-fix'

[thirdparty/git.git] / upload-pack.c

diff --git a/upload-pack.c b/upload-pack.c
index 4ac40c5b043ef75bf22692785e532878b2d19f14..401c9e6c4b70159ec0f0abc1d830d775d3a9f619 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -161,9 +161,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
        return 0;
 }
 
-static void create_pack_file(const struct object_array *have_obj,
-                            const struct object_array *want_obj,
-                            struct list_objects_filter_options *filter_options)
+static void create_pack_file(struct upload_pack_data *pack_data)
 {
        struct child_process pack_objects = CHILD_PROCESS_INIT;
        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");
        if (use_include_tag)
                argv_array_push(&pack_objects.args, "--include-tag");
-       if (filter_options->choice) {
+       if (pack_data->filter_options.choice) {
                const char *spec =
-                       expand_list_objects_filter_spec(filter_options);
+                       expand_list_objects_filter_spec(&pack_data->filter_options);
                if (pack_objects.use_shell) {
                        struct strbuf buf = STRBUF_INIT;
                        sq_quote_buf(&buf, spec);
@@ -226,13 +224,13 @@ static void create_pack_file(const struct object_array *have_obj,
        if (shallow_nr)
                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",
-                       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");
-       for (i = 0; i < have_obj->nr; i++)
+       for (i = 0; i < pack_data->have_obj.nr; i++)
                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++)
                fprintf(pipe_fd, "%s\n",
                        oid_to_hex(&extra_edge_obj.objects[i].item->oid));
@@ -913,13 +911,7 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
 static void receive_needs(struct upload_pack_data *data,
                          struct packet_reader *reader)
 {
-       struct object_array shallows = OBJECT_ARRAY_INIT;
-       struct string_list deepen_not = STRING_LIST_INIT_DUP;
-       int depth = 0;
        int has_non_tip = 0;
-       timestamp_t deepen_since = 0;
-       int deepen_rev_list = 0;
-       int deepen_relative = 0;
 
        shallow_nr = 0;
        for (;;) {
@@ -932,13 +924,13 @@ static void receive_needs(struct upload_pack_data *data,
                if (packet_reader_read(reader) != PACKET_READ_NORMAL)
                        break;
 
-               if (process_shallow(reader->line, &shallows))
+               if (process_shallow(reader->line, &data->shallows))
                        continue;
-               if (process_deepen(reader->line, &depth))
+               if (process_deepen(reader->line, &data->depth))
                        continue;
-               if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list))
+               if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
                        continue;
-               if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list))
+               if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
                        continue;
 
                if (skip_prefix(reader->line, "filter ", &arg)) {
@@ -955,7 +947,7 @@ static void receive_needs(struct upload_pack_data *data,
                            "expected to get object ID, not '%s'", reader->line);
 
                if (parse_feature_request(features, "deepen-relative"))
-                       deepen_relative = 1;
+                       data->deepen_relative = 1;
                if (parse_feature_request(features, "multi_ack_detailed"))
                        multi_ack = 2;
                else if (parse_feature_request(features, "multi_ack"))
@@ -1007,14 +999,18 @@ static void receive_needs(struct upload_pack_data *data,
        if (!use_sideband && daemon_mode)
                no_progress = 1;
 
-       if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
+       if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
                return;
 
-       if (send_shallow_list(&data->writer, depth, deepen_rev_list, deepen_since,
-                             &deepen_not, deepen_relative, &shallows,
+       if (send_shallow_list(&data->writer,
+                             data->depth,
+                             data->deepen_rev_list,
+                             data->deepen_since,
+                             &data->deepen_not,
+                             data->deepen_relative,
+                             &data->shallows,
                              &data->want_obj))
                packet_flush(1);
-       object_array_clear(&shallows);
 }
 
 /* return non-zero if the ref is hidden, otherwise 0 */
@@ -1179,9 +1175,7 @@ void upload_pack(struct upload_pack_options *options)
                receive_needs(&data, &reader);
                if (data.want_obj.nr) {
                        get_common_commits(&data, &reader);
-                       create_pack_file(&data.have_obj,
-                                        &data.want_obj,
-                                        &data.filter_options);
+                       create_pack_file(&data);
                }
        }
 
@@ -1525,9 +1519,7 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys,
                        send_shallow_info(&data);
 
                        packet_writer_write(&data.writer, "packfile\n");
-                       create_pack_file(&data.have_obj,
-                                        &data.want_obj,
-                                        &data.filter_options);
+                       create_pack_file(&data);
                        state = FETCH_DONE;
                        break;
                case FETCH_DONE: