Documentation: typofix --column description

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

diff --git a/upload-pack.c b/upload-pack.c
index 5dc8e1f844222b18ede6c3734a8ed5953ea59dd1..3b66bf92ba8ec074aea13e21d630cbce4a605aea 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -110,6 +110,7 @@ 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 advertise_sid : 1;
 };
 
 static void upload_pack_data_init(struct upload_pack_data *data)
@@ -141,6 +142,7 @@ static void upload_pack_data_init(struct upload_pack_data *data)
        packet_writer_init(&data->writer, 1);
 
        data->keepalive = 5;
+       data->advertise_sid = 0;
 }
 
 static void upload_pack_data_clear(struct upload_pack_data *data)
@@ -154,7 +156,7 @@ static void upload_pack_data_clear(struct upload_pack_data *data)
        string_list_clear(&data->deepen_not, 0);
        object_array_clear(&data->extra_edge_obj);
        list_objects_filter_release(&data->filter_options);
-       string_list_clear(&data->allowed_filters, 1);
+       string_list_clear(&data->allowed_filters, 0);
 
        free((char *)data->pack_objects_hook);
 }
@@ -321,6 +323,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
        pack_objects.in = -1;
        pack_objects.out = -1;
        pack_objects.err = -1;
+       pack_objects.clean_on_exit = 1;
 
        if (start_command(&pack_objects))
                die("git upload-pack: unable to fork git-pack-objects");
@@ -1056,6 +1059,7 @@ static void receive_needs(struct upload_pack_data *data,
                const char *features;
                struct object_id oid_buf;
                const char *arg;
+               int feature_len;
 
                reset_timeout(data->timeout);
                if (packet_reader_read(reader) != PACKET_READ_NORMAL)
@@ -1108,6 +1112,13 @@ static void receive_needs(struct upload_pack_data *data,
                    parse_feature_request(features, "filter"))
                        data->filter_capability_requested = 1;
 
+               arg = parse_feature_value(features, "session-id", &feature_len, NULL);
+               if (arg) {
+                       char *client_sid = xstrndup(arg, feature_len);
+                       trace2_data_string("transfer", NULL, "client-sid", client_sid);
+                       free(client_sid);
+               }
+
                o = parse_object(the_repository, &oid_buf);
                if (!o) {
                        packet_writer_error(&data->writer,
@@ -1178,6 +1189,11 @@ static void format_symref_info(struct strbuf *buf, struct string_list *symref)
                strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
 }
 
+static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) {
+       if (d->advertise_sid)
+               strbuf_addf(buf, " session-id=%s", trace2_session_id());
+}
+
 static int send_ref(const char *refname, const struct object_id *oid,
                    int flag, void *cb_data)
 {
@@ -1193,9 +1209,11 @@ static int send_ref(const char *refname, const struct object_id *oid,
 
        if (capabilities) {
                struct strbuf symref_info = STRBUF_INIT;
+               struct strbuf session_id = STRBUF_INIT;
 
                format_symref_info(&symref_info, &data->symref);
-               packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s object-format=%s agent=%s\n",
+               format_session_id(&session_id, data);
+               packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
                             oid_to_hex(oid), refname_nons,
                             0, capabilities,
                             (data->allow_uor & ALLOW_TIP_SHA1) ?
@@ -1205,9 +1223,11 @@ static int send_ref(const char *refname, const struct object_id *oid,
                             data->stateless_rpc ? " no-done" : "",
                             symref_info.buf,
                             data->allow_filter ? " filter" : "",
+                            session_id.buf,
                             the_hash_algo->name,
                             git_user_agent_sanitized());
                strbuf_release(&symref_info);
+               strbuf_release(&session_id);
        } else {
                packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
        }
@@ -1299,15 +1319,18 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
                data->allow_sideband_all = git_config_bool(var, value);
        } else if (!strcmp("core.precomposeunicode", var)) {
                precomposed_unicode = git_config_bool(var, value);
+       } else if (!strcmp("transfer.advertisesid", var)) {
+               data->advertise_sid = git_config_bool(var, value);
        }
 
        if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
-       current_config_scope() != CONFIG_SCOPE_WORKTREE) {
+           current_config_scope() != CONFIG_SCOPE_WORKTREE) {
                if (!strcmp("uploadpack.packobjectshook", var))
                        return git_config_string(&data->pack_objects_hook, var, value);
        }
 
-       parse_object_filter_config(var, value, data);
+       if (parse_object_filter_config(var, value, data) < 0)
+               return -1;
 
        return parse_hide_refs_config(var, value, "uploadpack");
 }